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

[Noriko Hosoi (nhosoi)]

Author: nhosoi

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

Modified Files:
      Tag: Directory71RtmBranch
	repl5_total.c 
Log Message:
Resolves: #430180 (original bug #429793)
Summary: RHDS7.1SP4: Replica crashes during online initialization with large
attribute value
Description: applied the patches to Directory71RtmBranch



Index: repl5_total.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_total.c,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- repl5_total.c	2 Mar 2006 01:11:55 -0000	1.5.2.1
+++ repl5_total.c	25 Jan 2008 02:07:36 -0000	1.5.2.2
@@ -869,12 +869,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,
@@ -893,7 +892,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 */