[Fedora-directory-commits] ldapserver/ldap/servers/plugins/acl acleffectiverights.c, 1.8, 1.9

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/acl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12494

Modified Files:
	acleffectiverights.c 
Log Message:
Resolves: #456296
Summary: GER: attribute types which do not belong to an entry should not be returned with effective rights
Description: when an attribute was given to the search request and the attribute
in the list does not belong to the entry, it was returning "*:none", which was
not true.  The star should be the attribute type.



Index: acleffectiverights.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/acleffectiverights.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- acleffectiverights.c	27 Jun 2008 19:28:22 -0000	1.8
+++ acleffectiverights.c	23 Jul 2008 15:14:11 -0000	1.9
@@ -666,6 +666,18 @@
 						gerstr, gerstrsize, gerstrcap, isfirstattr, errbuf );
 					isfirstattr = 0;
 				}
+				else
+				{
+					/* if the attr does not belong to the entry,
+					   "<attr>:none" is returned */
+					if (!isfirstattr)
+					{
+						_append_gerstr(gerstr, gerstrsize, gerstrcap, ", ", NULL);
+					}
+					_append_gerstr(gerstr, gerstrsize, gerstrcap, attrs[i], ":");
+					_append_gerstr(gerstr, gerstrsize, gerstrcap, "none", NULL);
+					isfirstattr = 0;
+				}
 			}
 		}
 		charray_free(allattrs);