Attachment #296474 for bug #509874

View | Details | Raw Unified | Return to bug 509874
Collapse All | Expand All

Lines 613-621 Link Here

(-)ui.ycp (-2 / +2 lines)
613		613
614	list<term>member_attributes = [	614	list<term>member_attributes = [
615	`item (`id("member"), "member", member_attribute == "member"),	615	`item (`id("member"), "member", member_attribute == "member"),
616	`item (`id("uniquemember"), "uniquemember", member_attribute == "uniquemember")	616	`item (`id("uniqueMember"), "uniqueMember", member_attribute == "uniqueMember")
617	];	617	];
618	if (member_attribute != "member" && member_attribute != "uniquemember")	618	if (member_attribute != "member" && member_attribute != "uniqueMember")
619	{	619	{
620	member_attributes = add (member_attributes,	620	member_attributes = add (member_attributes,
621	`item (`id(member_attribute), member_attribute, true));	621	`item (`id(member_attribute), member_attribute, true));




	{
	    list<string> map_attrs = ReadLdapConfEntries ("nss_map_attribute");
	    foreach (string map_attr, map_attrs, {
		if (issubstring (tolower (map_attr), "uniquemember"))
		if (issubstring (map_attr, "uniquemember"))
		{
		    list<string> attr	= splitstring (map_attr, " \t");
		    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;
		    }
		}

Return to bug 509874

Lines 736-748 Link Here

(-)Ldap.ycp (-3 / +5 lines)
736	{	736	{
737	list<string> map_attrs = ReadLdapConfEntries ("nss_map_attribute");	737	list<string> map_attrs = ReadLdapConfEntries ("nss_map_attribute");
738	foreach (string map_attr, map_attrs, {	738	foreach (string map_attr, map_attrs, {
739	map_attr = tolower (map_attr);	739	if (issubstring (tolower (map_attr), "uniquemember"))
740	if (issubstring (map_attr, "uniquemember"))
741	{	740	{
742	list<string> attr = splitstring (map_attr, " \t");	741	list<string> attr = splitstring (map_attr, " \t");
743	if (attr[0]:"" == "uniquemember")	742	if (tolower (attr[0]:"") == "uniquemember")
744	{	743	{
745	member_attribute = attr[1]:member_attribute;	744	member_attribute = attr[1]:member_attribute;
		745	// LDAP needs to know correct attribute name
		746	if (member_attribute == "uniquemember")
		747	member_attribute = "uniqueMember";
746	old_member_attribute = member_attribute;	748	old_member_attribute = member_attribute;
747	}	749	}
748	}	750	}