![](https://seccdn.libravatar.org/avatar/ccabc6c04379b11d036b089b67199614.jpg?s=120&d=mm&r=g)
Author: jsuchome Date: Mon Nov 12 15:30:32 2007 New Revision: 41972 URL: http://svn.opensuse.org/viewcvs/yast?rev=41972&view=rev Log: - do not override user modifications when creating default objects (#339232) - 2.16.2 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=41972&r1=41971&r2=41972&view=diff ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Mon Nov 12 15:30:32 2007 @@ -1 +1 @@ -2.16.1 +2.16.2 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=41972&r1=41971&r2=41972&view=diff ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Mon Nov 12 15:30:32 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 12 14:43:40 CET 2007 - jsuchome@suse.cz + +- do not override user modifications when creating default objects + (#339232) +- 2.16.2 + +------------------------------------------------------------------- Wed Oct 24 16:15:42 CEST 2007 - jsuchome@suse.cz - if crypted connection is switched off, adapt the checkbox value Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=41972&r1=41971&r2=41972&view=diff ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Mon Nov 12 15:30:32 2007 @@ -2060,14 +2060,16 @@ }); // create user configuration object - if (GetLDAPEntry (user_dn) == $[]) + if (config_modules[user_dn]:$[] == $[] && + GetLDAPEntry (user_dn) == $[]) { modules [user_dn] = CreateModule ( get_cn (user_dn), "suseuserconfiguration"); } // create group configuration object - if (GetLDAPEntry (group_dn) == $[]) + if (config_modules[group_dn]:$[] == $[] && + GetLDAPEntry (group_dn) == $[]) { modules [group_dn] = CreateModule ( get_cn (group_dn), "susegroupconfiguration"); @@ -2087,7 +2089,8 @@ update_modules = true; } - if (GetLDAPEntry (template_dn) == $[]) + if (templates[template_dn]:$[] == $[] && + GetLDAPEntry (template_dn) == $[]) { templs [template_dn] = CreateTemplate ( get_cn (template_dn), ["suseuserconfiguration"]); @@ -2103,7 +2106,8 @@ update_modules = true; } - if (GetLDAPEntry (template_dn) == $[]) + if (templates[template_dn]:$[] == $[] && + GetLDAPEntry (template_dn) == $[]) { templs [template_dn] = CreateTemplate ( get_cn (template_dn), ["susegroupconfiguration"]); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org