[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication windows_protocol_util.c, 1.50, 1.51

[Richard Allen Megginson]

Author: rmeggins

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

Modified Files:
	windows_protocol_util.c 
Log Message:
Resolves: bug 483256
Bug Description: DS crash when modify entry that does not exist in AD
Reviewed by: nkinder (Thanks!)
Fix Description: The function that checks to see if the mod has already been made to the AD entry should just return 0 if the AD entry does not exist or could not be found - in this case, the regular windows replay code will handle it.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no



Index: windows_protocol_util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- windows_protocol_util.c	26 Jan 2009 17:35:14 -0000	1.50
+++ windows_protocol_util.c	4 Feb 2009 20:40:34 -0000	1.51
@@ -1817,6 +1817,14 @@
 		return 1;
 	}
 
+	if (!ad_entry) { /* mods cannot already have been made */
+		slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
+						"%s: mod_already_made: "
+						"AD entry not found\n",
+						agmt_get_long_name(prp->agmt));
+		return retval; /* just allow - will probably fail later if entry really doesn't exist */
+	}
+
 	op = slapi_mod_get_operation(smod);
 	type = slapi_mod_get_type(smod);
 	if (SLAPI_IS_MOD_ADD(op)) { /* make sure value is not there */