Author: jsuchome Date: Fri Feb 15 10:30:02 2008 New Revision: 44483 URL: http://svn.opensuse.org/viewcvs/yast?rev=44483&view=rev Log: - remove LDAP entries from custom settings if LDAP is not present in /etc/nsswitch.conf (#bnc360600) - 2.13.59 Modified: branches/SuSE-SLE-10-SP2-Branch/users/VERSION branches/SuSE-SLE-10-SP2-Branch/users/package/yast2-users.changes branches/SuSE-SLE-10-SP2-Branch/users/src/Users.pm Modified: branches/SuSE-SLE-10-SP2-Branch/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/users/VERSION?rev=44483&r1=44482&r2=44483&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/users/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/users/VERSION Fri Feb 15 10:30:02 2008 @@ -1 +1 @@ -2.13.58 +2.13.59 Modified: branches/SuSE-SLE-10-SP2-Branch/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/users/package/yast2-users.changes?rev=44483&r1=44482&r2=44483&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/users/package/yast2-users.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/users/package/yast2-users.changes Fri Feb 15 10:30:02 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 15 10:07:18 CET 2008 - jsuchome@suse.cz + +- remove LDAP entries from custom settings if LDAP is not present + in /etc/nsswitch.conf (#bnc360600) +- 2.13.59 + +------------------------------------------------------------------- Mon Jan 21 11:04:29 CET 2008 - jsuchome@suse.cz - allow '\' in root's password during installation (#350478) Modified: branches/SuSE-SLE-10-SP2-Branch/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/users/src/Users.pm?rev=44483&r1=44482&r2=44483&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/users/src/Users.pm (original) +++ branches/SuSE-SLE-10-SP2-Branch/users/src/Users.pm Fri Feb 15 10:30:02 2008 @@ -1207,16 +1207,14 @@ if (@group_custom_sets == 0) { @group_custom_sets = ("local"); } - # LDAP is not set in nsswitch, but in customs - if (contains (\@user_custom_sets, "ldap") || - contains (\@group_custom_sets, "ldap")) { - $ldap_available = 1; - if (!contains (\@available_usersets, "ldap")) { - push @available_usersets, "ldap"; - } - if (!contains (\@available_groupsets, "ldap")) { - push @available_groupsets, "ldap"; - } + # LDAP is not set in nsswitch, but in customs: remove from customs (#360600) + if (!$ldap_available && + (contains (\@user_custom_sets, "ldap") || + contains (\@group_custom_sets, "ldap"))) + { + @user_custom_sets = grep (!/^ldap$/, @user_custom_sets); + @group_custom_sets = grep (!/^ldap$/, @group_custom_sets); + $customs_modified = 1; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org