Author: jsuchome Date: Mon Jun 8 15:04:33 2009 New Revision: 57493 URL: http://svn.opensuse.org/viewcvs/yast?rev=57493&view=rev Log: - fixed handling of uniqueMember option (bnc#509874) - 2.17.21 Modified: branches/SuSE-Code-11-Branch/ldap-client/VERSION branches/SuSE-Code-11-Branch/ldap-client/package/yast2-ldap-client.changes branches/SuSE-Code-11-Branch/ldap-client/src/Ldap.ycp branches/SuSE-Code-11-Branch/ldap-client/src/ui.ycp Modified: branches/SuSE-Code-11-Branch/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ldap-client/VERSION?rev=57493&r1=57492&r2=57493&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/ldap-client/VERSION (original) +++ branches/SuSE-Code-11-Branch/ldap-client/VERSION Mon Jun 8 15:04:33 2009 @@ -1 +1 @@ -2.17.20 +2.17.21 Modified: branches/SuSE-Code-11-Branch/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ldap-client/package/yast2-ldap-client.changes?rev=57493&r1=57492&r2=57493&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/ldap-client/package/yast2-ldap-client.changes (original) +++ branches/SuSE-Code-11-Branch/ldap-client/package/yast2-ldap-client.changes Mon Jun 8 15:04:33 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 8 14:45:51 CEST 2009 - jsuchome@suse.cz + +- fixed handling of uniqueMember option (bnc#509874) +- 2.17.21 + +------------------------------------------------------------------- Fri Jun 5 13:50:17 CEST 2009 - jsuchome@suse.cz - fixed architecture dependent packages for PPC (bnc#505263) Modified: branches/SuSE-Code-11-Branch/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ldap-client/src/Ldap.ycp?rev=57493&r1=57492&r2=57493&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/ldap-client/src/Ldap.ycp (original) +++ branches/SuSE-Code-11-Branch/ldap-client/src/Ldap.ycp Mon Jun 8 15:04:33 2009 @@ -735,13 +735,15 @@ { list<string> map_attrs = ReadLdapConfEntries ("nss_map_attribute"); foreach (string map_attr, map_attrs, { - map_attr = tolower (map_attr); - if (issubstring (map_attr, "uniquemember")) + if (issubstring (tolower (map_attr), "uniquemember")) { list<string> attr = splitstring (map_attr, " \t"); - if (attr[0]:"" == "uniquemember") + if (tolower (attr[0]:"") == "uniquemember") { member_attribute = attr[1]:member_attribute; + // LDAP needs to know correct attribute name + if (member_attribute == "uniquemember") + member_attribute = "uniqueMember"; old_member_attribute = member_attribute; } } Modified: branches/SuSE-Code-11-Branch/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ldap-client/src/ui.ycp?rev=57493&r1=57492&r2=57493&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/ldap-client/src/ui.ycp (original) +++ branches/SuSE-Code-11-Branch/ldap-client/src/ui.ycp Mon Jun 8 15:04:33 2009 @@ -609,9 +609,9 @@ list<term>member_attributes = [ `item (`id("member"), "member", member_attribute == "member"), - `item (`id("uniquemember"), "uniquemember", member_attribute == "uniquemember") + `item (`id("uniqueMember"), "uniqueMember", member_attribute == "uniqueMember") ]; - if (member_attribute != "member" && member_attribute != "uniquemember") + if (member_attribute != "member" && member_attribute != "uniqueMember") { member_attributes = add (member_attributes, `item (`id(member_attribute), member_attribute, true)); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org