[Fedora-directory-commits] ldapserver/ldap/servers/plugins/uiduniq 7bit.c, 1.7, 1.8 uid.c, 1.8, 1.9

[Nathan Kinder]

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/uiduniq
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9536/ldap/servers/plugins/uiduniq

Modified Files:
	7bit.c uid.c 
Log Message:
Resolves: 470918
Summary: Made replica_set_updatedn detect value add modify operations properly.



Index: 7bit.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/uiduniq/7bit.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 7bit.c	10 Nov 2006 23:45:31 -0000	1.7
+++ 7bit.c	13 Nov 2008 23:08:18 -0000	1.8
@@ -458,8 +458,8 @@
 	if ((slapi_attr_type_cmp(mod->mod_type, attr_name, 1) == 0) && /* mod contains target attr */
 	    (mod->mod_op & LDAP_MOD_BVALUES) && /* mod is bval encoded (not string val) */
 	    (mod->mod_bvalues && mod->mod_bvalues[0]) && /* mod actually contains some values */
-	    (((mod->mod_op & ~LDAP_MOD_BVALUES) == LDAP_MOD_ADD) || /* mod is add */
-	     (mod->mod_op & LDAP_MOD_REPLACE))) /* mod is replace */
+	    (SLAPI_IS_MOD_ADD(mod->mod_op) || /* mod is add */
+	     SLAPI_IS_MOD_REPLACE(mod->mod_op))) /* mod is replace */
 	{
 	  addMod(&checkmods, &checkmodsCapacity, &modcount, mod);
 	}


Index: uid.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/uiduniq/uid.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- uid.c	10 Nov 2006 23:45:31 -0000	1.8
+++ uid.c	13 Nov 2008 23:08:18 -0000	1.9
@@ -727,8 +727,8 @@
 	if ((slapi_attr_type_cmp(mod->mod_type, attrName, 1) == 0) && /* mod contains target attr */
 	    (mod->mod_op & LDAP_MOD_BVALUES) && /* mod is bval encoded (not string val) */
 	    (mod->mod_bvalues && mod->mod_bvalues[0]) && /* mod actually contains some values */
-	    (((mod->mod_op & ~LDAP_MOD_BVALUES) == LDAP_MOD_ADD) || /* mod is add */
-	     (mod->mod_op & LDAP_MOD_REPLACE))) /* mod is replace */
+	    (SLAPI_IS_MOD_ADD(mod->mod_op) || /* mod is add */
+	     SLAPI_IS_MOD_REPLACE(mod->mod_op))) /* mod is replace */
 	{
 	  addMod(&checkmods, &checkmodsCapacity, &modcount, mod);
 	}