diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-02-12 14:08:15 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-02-12 14:08:15 +0000 |
| commit | 255923bbbdd445bbb8e6e930ad427c4067eb305b (patch) | |
| tree | bb772484081499b959826194816c1a83f1ce1f4a /perl-install | |
| parent | 82bc611695ab829cfdbe3dc7ba002c9d67430175 (diff) | |
| download | drakx-255923bbbdd445bbb8e6e930ad427c4067eb305b.tar drakx-255923bbbdd445bbb8e6e930ad427c4067eb305b.tar.gz drakx-255923bbbdd445bbb8e6e930ad427c4067eb305b.tar.bz2 drakx-255923bbbdd445bbb8e6e930ad427c4067eb305b.tar.xz drakx-255923bbbdd445bbb8e6e930ad427c4067eb305b.zip | |
- install ldap packages *before* doing ldapsearch
- pam*.so modules do not have /lib/security/ prefix anymore
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/authentication.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm index c085adc35..df9eeb2d4 100644 --- a/perl-install/authentication.pm +++ b/perl-install/authentication.pm @@ -64,14 +64,13 @@ sub set { log::l("authentication::set $kind with $val"); if ($kind eq 'LDAP') { + $in->do_pkgs->install(qw(openldap-clients nss_ldap pam_ldap autofs)); my $domain = $netc->{LDAPDOMAIN} || do { my $s = run_program::rooted_get_stdout($::prefix, 'ldapsearch', '-x', '-h', $val, '-b', '', '-s', 'base', '+'); first($s =~ /namingContexts: (.+)/); } or log::l("no ldap domain found on server $val"), return; - $in->do_pkgs->install(qw(openldap-clients nss_ldap pam_ldap autofs)); - set_nsswitch_priority('ldap'); set_pam_authentication('ldap'); set_ldap_conf($domain, $val, 1); @@ -116,7 +115,7 @@ sub pam_modules() { 'pam_ldap', 'pam_winbind', 'pam_mkhomedir'; } sub pam_module_from_path { - $_[0] && $_[0] =~ m|/lib/security/(pam_.*)\.so| && $1; + $_[0] && $_[0] =~ m|(/lib/security/)?(pam_.*)\.so| && $2; } sub pam_module_to_path { "/lib/security/$_[0].so"; |