From 1dec6e65f12d08fa79717d6d8630a1cda4e0ce2a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 5 Jun 2010 20:50:23 +0000 Subject: fix installing lib64sasl2-plug-gssapi instead of libsasl2-plug-gssapi on 64bit machines when 32bit media are available (#57728) --- perl-install/NEWS | 5 +++++ 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" ], ); -- cgit v1.2.1