Author: jsuchome Date: Fri Feb 15 10:39:38 2008 New Revision: 44486 URL: http://svn.opensuse.org/viewcvs/yast?rev=44486&view=rev Log: - remove LDAP entries from custom settings if LDAP is not present in /etc/nsswitch.conf (#bnc360600) - 2.16.10 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/Users.pm Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=44486&r1=44485&r2=44486&view=diff ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Fri Feb 15 10:39:38 2008 @@ -1 +1 @@ -2.16.9 +2.16.10 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=44486&r1=44485&r2=44486&view=diff ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Fri Feb 15 10:39:38 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 15 10:10:08 CET 2008 - jsuchome@suse.cz + +- remove LDAP entries from custom settings if LDAP is not present + in /etc/nsswitch.conf (#bnc360600) +- 2.16.10 + +------------------------------------------------------------------- Fri Feb 15 08:21:47 CET 2008 - jsuchome@suse.cz - moved password and user name checks to UsersSimple.pm to make Modified: trunk/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Users.pm?rev=44486&r1=44485&r2=44486&view=diff ============================================================================== --- trunk/users/src/Users.pm (original) +++ trunk/users/src/Users.pm Fri Feb 15 10:39:38 2008 @@ -1223,16 +1223,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