From f32ff9594c8559a2bad60b14c0540196067d559f Mon Sep 17 00:00:00 2001 From: freesource Date: Thu, 29 Nov 2001 17:32:33 +0000 Subject: [PATCH] This returns the logic back to the original default for pam by not checking for lib deps for pam service modules when PAM Config is off. --- BootRoot/Yard.pm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/BootRoot/Yard.pm b/BootRoot/Yard.pm index ada932c..c64c5e4 100644 --- a/BootRoot/Yard.pm +++ b/BootRoot/Yard.pm @@ -52,7 +52,7 @@ use BootRoot::Error; my (%Included, %replaced_by, %links_to, %is_module, %hardlinked, %strippable, %lib_needed_by, @Libs, %user_defined_link); -my %pam_repeats; +my (%pam_repeats, $find_pam); my $cf_line = 0; my $BLKGETSIZE_ioctl = 4704; my $BLKFLSBUF_ioctl = 4705; @@ -494,7 +494,7 @@ sub extra_links { # First we find nss and pam stuff if asked for. my $find_nss = $nss_pam->{60}{conf_nss}; - my $find_pam = $nss_pam->{61}{conf_pam}; + $find_pam = $nss_pam->{61}{conf_pam}; if ( $find_nss == 1 || $find_pam == 1 ) { @@ -600,6 +600,14 @@ sub library_dependencies { ( $file =~ m,/security/pam_\w+\.so, ) ) { + ## Determine whether to continue with pam to keep original + ## default behavior. + if ( $find_pam != 1 ) { + if ( $file =~ m,/security/pam_\w+\.so, ) { + next; + } + } + ##### EXECUTABLE LOADABLE BINARY ##### Run ldd to get library dependencies. my $line;