Author: jsuchome Date: Wed Jan 13 09:12:53 2010 New Revision: 60343 URL: http://svn.opensuse.org/viewcvs/yast?rev=60343&view=rev Log: - use crypt for pam_password if exop is not supported (bnc#546398) - 2.19.0 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=60343&r1=60342&r2=60343&view=diff ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Wed Jan 13 09:12:53 2010 @@ -1 +1 @@ -2.18.5 +2.19.0 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-client.changes?rev=60343&r1=60342&r2=60343&view=diff ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Wed Jan 13 09:12:53 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 13 09:06:44 CET 2010 - jsuchome@suse.cz + +- use crypt for pam_password if exop is not supported (bnc#546398) +- 2.19.0 + +------------------------------------------------------------------- Thu Sep 3 14:11:25 CEST 2009 - jsuchome@suse.cz - added keywords to desktop files Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=60343&r1=60342&r2=60343&view=diff ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Wed Jan 13 09:12:53 2010 @@ -682,6 +682,17 @@ nss_base_group = ReadLdapConfEntry ("nss_base_group", base_dn); pam_password = ReadLdapConfEntry ("pam_password", "exop"); + // check if Password Modify extenstion is supported (bnc#546398, c#6) + if (pam_password == "exop") + { + if (0 == SCR::Execute (.target.bash, "ldapsearch -x -b '' -s base") && // LDAP server accessible + 0 != SCR::Execute (.target.bash, + "ldapsearch -x -b '' -s base supportedExtension | grep -i '^supportedExtension:[[:space:]]*1.3.6.1.4.1.4203.1.11.1'")) + { + y2warning ("'exop' value not supported on server, using 'crypt'"); + pam_password = "crypt"; + } + } // read sysconfig values base_config_dn = (string)SCR::Read (.sysconfig.ldap.BASE_CONFIG_DN); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org