summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-06-13 09:15:00 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-06-13 09:15:00 +0000
commitdb1e3a861f30574234c50f41772d577e12101c8d (patch)
tree4d56a13fe9d47df6a9275f557af0f0fce5363ca8
parentb59dd4a4556b9865c537c507780538110f87d1f8 (diff)
downloaddrakx-backup-do-not-use-db1e3a861f30574234c50f41772d577e12101c8d.tar
drakx-backup-do-not-use-db1e3a861f30574234c50f41772d577e12101c8d.tar.gz
drakx-backup-do-not-use-db1e3a861f30574234c50f41772d577e12101c8d.tar.bz2
drakx-backup-do-not-use-db1e3a861f30574234c50f41772d577e12101c8d.tar.xz
drakx-backup-do-not-use-db1e3a861f30574234c50f41772d577e12101c8d.zip
stop messing with likeauth and nullok options and keep them on the pam_unix line (bugzilla #12066)
-rw-r--r--perl-install/authentication.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm
index ce9ac04d6..4420911d9 100644
--- a/perl-install/authentication.pm
+++ b/perl-install/authentication.pm
@@ -420,8 +420,7 @@ sub set_pam_authentication {
}
if ($module eq 'pam_unix' && $special{$type}) {
my @para_for_last =
- $type eq 'auth' ? qw(likeauth nullok use_first_pass) :
- $type eq 'account' ? qw(use_first_pass) : @{[]};
+ member($type, 'auth', 'account') ? qw(use_first_pass) : @{[]};
@para = difference2(\@para, \@para_for_last);
my ($before_noask, $ask) = partition { $_ eq 'castella' } @{$special{$type}};