diff options
author | Thierry Vignaud <tv@mandriva.org> | 2010-06-05 20:50:23 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mandriva.org> | 2010-06-05 20:50:23 +0000 |
commit | 1dec6e65f12d08fa79717d6d8630a1cda4e0ce2a (patch) | |
tree | 100699c021a567eaf84b04eb06a64b1f80c1c7b8 | |
parent | 9b0e910fad286278b22b2f87ff51d0e395c32c0e (diff) | |
download | drakx-backup-do-not-use-1dec6e65f12d08fa79717d6d8630a1cda4e0ce2a.tar drakx-backup-do-not-use-1dec6e65f12d08fa79717d6d8630a1cda4e0ce2a.tar.gz drakx-backup-do-not-use-1dec6e65f12d08fa79717d6d8630a1cda4e0ce2a.tar.bz2 drakx-backup-do-not-use-1dec6e65f12d08fa79717d6d8630a1cda4e0ce2a.tar.xz drakx-backup-do-not-use-1dec6e65f12d08fa79717d6d8630a1cda4e0ce2a.zip |
fix installing lib64sasl2-plug-gssapi instead of libsasl2-plug-gssapi on
64bit machines when 32bit media are available (#57728)
-rw-r--r-- | perl-install/NEWS | 5 | ||||
-rw-r--r-- | perl-install/authentication.pm | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 0d2aff1c8..0a7fcbec2 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,8 @@ +- drakauth: + o fix installing lib64sasl2-plug-gssapi instead of + libsasl2-plug-gssapi on 64bit machines when 32bit media are + available (#57728) + - harddrake: o fix displaying encoded reason o fix translating reasons for 2nd stage warning diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm index 452a0667a..25022963d 100644 --- a/perl-install/authentication.pm +++ b/perl-install/authentication.pm @@ -47,13 +47,15 @@ my %kind2nsswitch = ( winbind => ['winbind'], ); +my $lib = (arch() =~ /x86_64/ ? 'lib64' : 'lib'); + my %kind2packages = ( local => [], SmartCard => [ 'castella-pam' ], LDAP => [ 'openldap-clients', 'nss_ldap', 'pam_ldap', 'autofs', 'nss_updatedb' ], - KRB5 => [ 'nss_ldap', 'pam_krb5', 'libsasl2-plug-gssapi', 'nss_updatedb' ], + KRB5 => [ 'nss_ldap', 'pam_krb5', "${lib}sasl2-plug-gssapi", 'nss_updatedb' ], NIS => [ 'ypbind', 'autofs' ], - winbind => [ 'samba-winbind', 'nss_ldap', 'pam_krb5', 'libsasl2-plug-gssapi' ], + winbind => [ 'samba-winbind', 'nss_ldap', 'pam_krb5', "${lib}sasl2-plug-gssapi" ], ); |