[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication repl5_total.c, 1.10, 1.11

Nathan Kinder (nkinder) fedora-directory-commits at redhat.com
Fri Jan 25 00:59:02 UTC 2008


Author: nkinder

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

Modified Files:
	repl5_total.c 
Log Message:
Resolves: 429793
Summary: Fixed crash in replication during bulk import.  Use bulk impport code more consistently.



Index: repl5_total.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_total.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- repl5_total.c	18 Oct 2007 00:08:31 -0000	1.10
+++ repl5_total.c	25 Jan 2008 00:59:00 -0000	1.11
@@ -872,12 +872,11 @@
 #endif
 
        rc = slapi_import_entry (pb, e); 
-       /* slapi_import_entry return an LDAP error in case of problem
-        * LDAP_BUSY is used to indicate that the import queue is full
-        * and that flow control must happen to stop the supplier 
-        * from sending entries
+       /* slapi_import_entry returns an LDAP error in case of a
+        * problem.  If there's a problem, it's our responsibility
+        * to free the slapi_entry that we're trying to import.
         */
-       if ((rc != LDAP_SUCCESS) && (rc != LDAP_BUSY))
+       if (rc != LDAP_SUCCESS)
 	   {
 		   const char *dn = slapi_entry_get_dn_const(e);
 		   slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
@@ -896,7 +895,7 @@
 						rc, connid, opid);
 	}
    
-    if ((rc != 0) && (rc != LDAP_BUSY))
+    if (rc != 0)
     {
         /* just disconnect from the supplier. bulk import is stopped when
            connection object is destroyed */




More information about the Fedora-directory-commits mailing list