summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-08-20 14:59:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-08-20 14:59:04 +0000
commite9bb0164d90b7e626cfda6453ceb661385c33c55 (patch)
tree123526e267403d94810d5932afe9dca46a4a5932
parent88508cbb6720e4c98ac4e335ec45dc9f3128d077 (diff)
downloaddrakx-e9bb0164d90b7e626cfda6453ceb661385c33c55.tar
drakx-e9bb0164d90b7e626cfda6453ceb661385c33c55.tar.gz
drakx-e9bb0164d90b7e626cfda6453ceb661385c33c55.tar.bz2
drakx-e9bb0164d90b7e626cfda6453ceb661385c33c55.tar.xz
drakx-e9bb0164d90b7e626cfda6453ceb661385c33c55.zip
- drakauth:
o handle pam_tcb instead of (deprecated) pam_unix (#42471) (as told by vdanen)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/authentication.pm8
2 files changed, 7 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index e39fc83f3..76aee8132 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakauth:
+ o handle pam_tcb instead of (deprecated) pam_unix (#42471)
+
Version 11.16 - 19 August 2008
- share new advanced icon with standalone tools
diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm
index ab62af40f..48a7829e7 100644
--- a/perl-install/authentication.pm
+++ b/perl-install/authentication.pm
@@ -483,7 +483,7 @@ sub get_pam_authentication_kinds() {
sub sufficient {
my ($ccreds, $module, $type) = @_;
- $ccreds && member($module, 'pam_unix' , 'pam_winbind') ?
+ $ccreds && member($module, 'pam_tcb' , 'pam_winbind') ?
'sufficient' :
$ccreds && member($module, 'pam_ldap', 'pam_krb5') && $type eq 'account' ?
'[authinfo_unavail=ignore default=done]' :
@@ -548,7 +548,7 @@ sub set_pam_authentication {
#- first removing previous config
$_ = '';
}
- if ($module eq 'pam_unix' && $special{$type}) {
+ if ($module eq 'pam_tcb' && $special{$type}) {
my @para_for_last =
member($type, 'auth', 'account') ? qw(use_first_pass) : @{[]};
@para = difference2(\@para, \@para_for_last);
@@ -560,7 +560,7 @@ sub set_pam_authentication {
}
my @l = ((map { [ "pam_$_" ] } @$before_noask),
- [ 'pam_unix', @para ],
+ [ 'pam_tcb', @para ],
(map { [ "pam_$_" ] } @$ask),
);
push @{$l[-1]}, @para_for_last;
@@ -588,7 +588,7 @@ sub set_pam_authentication {
if (my $s = delete $before_first{$type}) {
$_ = $s . $_;
}
- if ($control eq 'required' && member($module, 'pam_deny', 'pam_permit', 'pam_unix')) {
+ if ($control eq 'required' && member($module, 'pam_deny', 'pam_permit', 'pam_tcb')) {
if (my $s = delete $after_deny{$type}) {
$_ .= $s;
}