remove redundant source file and associated Makefile line

ldap/servers/plugins/replication/Makefile

@@ -121,7 +121,6 @@ LOCAL_OBJS= \
 	repl5_updatedn_list.o\
 	windows_inc_protocol.o \
 	windows_tot_protocol.o \
-	windows_total.o \
 	windows_protocol_util.o \
 	windows_private.o \
 	windows_connection.o

ldap/servers/plugins/replication/windows_total.c

@@ -1,750 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-
-
-#include "repl5.h"
-#include "slap.h"
-		
-#define CSN_TYPE_VALUE_UPDATED_ON_WIRE 1
-#define CSN_TYPE_VALUE_DELETED_ON_WIRE 2
-#define CSN_TYPE_VALUE_DISTINGUISHED_ON_WIRE 3
-
-/* #define GORDONS_PATENTED_BER_DEBUG 1 */
-#ifdef GORDONS_PATENTED_BER_DEBUG
-#define BER_DEBUG(a) printf(a)
-#else
-#define BER_DEBUG(a)
-#endif
-
-/* Forward declarations */
-static int my_ber_printf_csn(BerElement *ber, const CSN *csn, const CSNType t);
-static int my_ber_printf_value(BerElement *ber, const char *type,
-		                       const Slapi_Value *value, PRBool deleted);
-static int my_ber_printf_attr (BerElement *ber, Slapi_Attr *attr, PRBool deleted);
-static int my_ber_scanf_attr (BerElement *ber, Slapi_Attr **attr, PRBool *deleted);
-static int my_ber_scanf_value(BerElement *ber, Slapi_Value **value, PRBool *deleted);
-
-/*
- * Helper function - convert a CSN to a string and ber_printf() it.
- */
-static int
-my_ber_printf_csn(BerElement *ber, const CSN *csn, const CSNType t)
-{
-	char csn_str[CSN_STRSIZE];
-	unsigned long len;
-	int rc = -1;
-	int csn_type_as_ber = -1;
-
-	LDAPDebug( LDAP_DEBUG_TRACE, "=> my_ber_printf_csn\n", 0, 0, 0 );
-
-	switch (t)
-	{
-	    case CSN_TYPE_VALUE_UPDATED:
-		    csn_type_as_ber = CSN_TYPE_VALUE_UPDATED_ON_WIRE;
-		    break;
-	    case CSN_TYPE_VALUE_DELETED:
-		    csn_type_as_ber = CSN_TYPE_VALUE_DELETED_ON_WIRE;
-		    break;
-	    case CSN_TYPE_VALUE_DISTINGUISHED:
-		    csn_type_as_ber = CSN_TYPE_VALUE_DISTINGUISHED_ON_WIRE;
-		    break;
-        case CSN_TYPE_ATTRIBUTE_DELETED:
-            break;
-	    default:
-            slapi_log_error(SLAPI_LOG_FATAL, windows_repl_plugin_name, "my_ber_printf_csn: unknown "
-			                "csn type %d encountered.\n", (int)t);
-		LDAPDebug( LDAP_DEBUG_TRACE, "<= my_ber_printf_csn\n", 0, 0, 0 );
-        return -1;
-	}
-
-    csn_as_string(csn,PR_FALSE,csn_str);
-
-    /* we don't send type for attr csn since there is only one */
-	if (t == CSN_TYPE_ATTRIBUTE_DELETED)    	
-    {        
-		rc = ber_printf(ber, "s", csn_str);
-		BER_DEBUG("s(csn_str)");
-	}
-    else
-    {
-		len = CSN_STRSIZE;
-    	rc = ber_printf(ber, "{es}", csn_type_as_ber, csn_str);
-		BER_DEBUG("{e(csn type)s(csn)}");
-    }
-
-	LDAPDebug( LDAP_DEBUG_TRACE, "<= my_ber_printf_csn\n", 0, 0, 0 );
-
-	return rc;
-}
-
-
-/*
- * Send a single annotated attribute value.
- */
-static int
-my_ber_printf_value(BerElement *ber, const char *type, const Slapi_Value *value, PRBool deleted)
-{
-	const struct berval *bval = NULL;
-	int rc = -1;
-    const CSNSet *csnset;
-    void *cookie;
-    CSN *csn;
-    CSNType t;
-
-	LDAPDebug( LDAP_DEBUG_TRACE, "=> my_ber_printf_value\n", 0, 0, 0 );
-
-    bval = slapi_value_get_berval(value);
-	BER_DEBUG("{o(value)");
-	if (ber_printf(ber, "{o", bval->bv_val, bval->bv_len) == -1) /* Start sequence */
-	{
-		goto done;
-	}
-	
-/*	if (ber_printf(ber, "o", bval->bv_val, bval->bv_len) == -1)
-	{
-		goto done;
-	} */
-
-    if (deleted)
-    {
-		BER_DEBUG("b(deleted flag)");
-        if (ber_printf (ber, "b", PR_TRUE) == -1)
-        {
-            goto done;
-        }
-    }
-	/* Send value CSN list */
-	BER_DEBUG("{");
-	if (ber_printf(ber, "{") == -1) /* Start set */
-	{
-		goto done;
-	}
-
-    /* Iterate over the sequence of CSNs. */
-	csnset = value_get_csnset (value);
-    if (csnset)
-    {
-        for (cookie = csnset_get_first_csn (csnset, &csn, &t); NULL != cookie;
-             cookie = csnset_get_next_csn (csnset, cookie, &csn, &t))
-        {
-			/* Don't send any adcsns, since that was already sent */
-			if (t != CSN_TYPE_ATTRIBUTE_DELETED)
-			{
-				if (my_ber_printf_csn(ber, csn, t) == -1)
-				{
-					goto done;
-				}
-			}
-        }
-    }
-	
-	BER_DEBUG("}");
-	if (ber_printf(ber, "}") == -1) /* End CSN sequence */
-	{
-		goto done;
-	}
-	BER_DEBUG("}");
-	if (ber_printf(ber, "}") == -1) /* End sequence */
-	{
-		goto done;
-	}
-
-	/* Everything's ok */
-	rc = 0;
-
-done:
-	LDAPDebug( LDAP_DEBUG_TRACE, "<= my_ber_printf_value\n", 0, 0, 0 );
-	return rc;
-
-}
-
-/* send a single attribute */
-static int 
-my_ber_printf_attr (BerElement *ber, Slapi_Attr *attr, PRBool deleted)
-{
-    Slapi_Value *value;
-	char *type;
-    int i;
-    const CSN *csn;
-
-	LDAPDebug( LDAP_DEBUG_TRACE, "=> my_ber_printf_attr\n", 0, 0, 0 );
-			
-    /* First, send the type */
-	slapi_attr_get_type(attr, &type);
-	BER_DEBUG("{s(type ");
-	BER_DEBUG(type);
-	BER_DEBUG(")");
-	if (ber_printf(ber, "{s", type) == -1) /* Begin sequence for this type */
-	{
-		goto loser;
-	}
-
-	/* Send the attribute deletion CSN if present */
-	csn = attr_get_deletion_csn(attr);
-    if (csn)
-    {
-		if (my_ber_printf_csn(ber, csn, CSN_TYPE_ATTRIBUTE_DELETED) == -1)
-		{
-			goto loser;
-		}
-    }
-
-    /* only send "is deleted" flag for deleted attributes since it defaults to false */
-    if (deleted)
-    {
-		BER_DEBUG("b(del flag)");
-        if (ber_printf (ber, "b", PR_TRUE) == -1)
-        {
-            goto loser;
-        }
-    }
-
-	/*
-	 * Iterate through all the values. 
-     */
-	BER_DEBUG("[");
-	if (ber_printf(ber, "[") == -1) /* Begin set */
-	{
-		goto loser;
-	}
-	
-    /* 
-     * Process the non-deleted values first.
-     */
-	i = slapi_attr_first_value(attr, &value);
-	while (i != -1)
-	{
-		if (my_ber_printf_value(ber, type, value, PR_FALSE) == -1)
-		{
-			goto loser;
-		}
-		i= slapi_attr_next_value(attr, i, &value);
-	}
-
-	/*
- 	 * Now iterate over all of the deleted values.
-	 */
-	i= attr_first_deleted_value(attr, &value);
-	while (i != -1)
-	{
-		if (my_ber_printf_value(ber, type, value, PR_TRUE) == -1)
-		{
-			goto loser;
-		}
-		i= attr_next_deleted_value(attr, i, &value);
-	}
-	BER_DEBUG("]");
-	if (ber_printf(ber, "]") == -1) /* End set */
-	{
-		goto loser;
-	}
-
-	BER_DEBUG("}");
-    if (ber_printf(ber, "}") == -1) /* End sequence for this type */
-	{
-		goto loser;
-	}
-
-	LDAPDebug( LDAP_DEBUG_TRACE, "<= my_ber_printf_attr\n", 0, 0, 0 );
-    return 0;
-loser:
-	LDAPDebug( LDAP_DEBUG_TRACE, "<= my_ber_printf_attr - loser\n", 0, 0, 0 );
-    return -1;
-}
-
-/*
- * Get an annotated value from the BerElement. Returns 0 on
- * success, -1 on failure.
- */
-static int
-my_ber_scanf_value(BerElement *ber, Slapi_Value **value, PRBool *deleted)
-{
-	struct berval *attrval = NULL;
-	unsigned long len;
-    unsigned long tag;
-    CSN *csn = NULL;
-    char csnstring[CSN_STRSIZE + 1];
-	CSNType csntype;
-    char *lasti;
-
-	LDAPDebug( LDAP_DEBUG_TRACE, "=> my_ber_scanf_value\n", 0, 0, 0 );
-
-	PR_ASSERT(ber && value && deleted);
-
-    *value = NULL;
-
-	if (NULL == ber && NULL == value)
-	{
-		slapi_log_error(SLAPI_LOG_FATAL, windows_repl_plugin_name, "my_ber_scanf_value BAD 1\n");
-		goto loser;
-	}
-
-	/* Each value is a sequence */
-	if (ber_scanf(ber, "{O", &attrval) == -1)
-	{
-		slapi_log_error(SLAPI_LOG_FATAL, windows_repl_plugin_name, "my_ber_scanf_value BAD 2\n");
-		goto loser;
-	}
-	/* Allocate and fill in the attribute value */
-	if ((*value = slapi_value_new_berval(attrval)) == NULL)
-	{
-		slapi_log_error(SLAPI_LOG_FATAL, windows_repl_plugin_name, "my_ber_scanf_value BAD 3\n");
-		goto loser;
-	}
-
-    /* check if this is a deleted value */
-    if (ber_peek_tag(ber, &len) == LBER_BOOLEAN)
-    {
-        if (ber_scanf(ber, "b", deleted) == -1)
-		{
-			slapi_log_error(SLAPI_LOG_FATAL, windows_repl_plugin_name, "my_ber_scanf_value BAD 4\n");
-			goto loser;
-		}
-    }
-        
-    else /* default is present value */
-    {
-        *deleted = PR_FALSE;
-    }
-
-	/* Read the sequence of CSNs */
-    for (tag = ber_first_element(ber, &len, &lasti);
-		tag != LBER_ERROR && tag != LBER_END_OF_SEQORSET;
-		tag = ber_next_element(ber, &len, lasti))
-	{
-		long csntype_tmp;
-		/* Each CSN is in a sequence that includes a csntype and CSN */
-		len = CSN_STRSIZE;
-		if (ber_scanf(ber, "{es}", &csntype_tmp, csnstring, &len) == -1)
-		{
-			slapi_log_error(SLAPI_LOG_FATAL, windows_repl_plugin_name, "my_ber_scanf_value BAD 7 - bval is %s\n", attrval->bv_val);
-			goto loser;
-		}
-		switch (csntype_tmp)
-		{
-		case CSN_TYPE_VALUE_UPDATED_ON_WIRE:
-			csntype = CSN_TYPE_VALUE_UPDATED;
-			break;
-		case CSN_TYPE_VALUE_DELETED_ON_WIRE:
-			csntype = CSN_TYPE_VALUE_DELETED;
-			break;
-		case CSN_TYPE_VALUE_DISTINGUISHED_ON_WIRE:
-			csntype = CSN_TYPE_VALUE_DISTINGUISHED;
-			break;
-		default:
-			slapi_log_error(SLAPI_LOG_FATAL, windows_repl_plugin_name, "Error: preposterous CSN type "
-				"%d received during total update.\n", csntype_tmp);
-			goto loser;
-		}
-		csn = csn_new_by_string(csnstring);
-		if (csn == NULL)
-		{
-			slapi_log_error(SLAPI_LOG_FATAL, windows_repl_plugin_name, "my_ber_scanf_value BAD 8\n");
-			goto loser;
-		}
-		value_add_csn(*value, csntype, csn);
-        csn_free (&csn);
-	}
-
-	if (ber_scanf(ber, "}") == -1) /* End of annotated attribute value seq */
-	{
-		slapi_log_error(SLAPI_LOG_FATAL, windows_repl_plugin_name, "my_ber_scanf_value BAD 10\n");
-		goto loser;
-	}
-	
-    if (attrval)
-        ber_bvfree(attrval); 
-	LDAPDebug( LDAP_DEBUG_TRACE, "<= my_ber_scanf_value\n", 0, 0, 0 );
-	return 0;
-
-loser:
-	/* Free any stuff we allocated */
-	if (csn)
-        csn_free (&csn);
-    if (attrval)
-        ber_bvfree(attrval); 
-    if (value)
-    {
-        slapi_value_free (value);
-    }
-	LDAPDebug( LDAP_DEBUG_TRACE, "<= my_ber_scanf_value - loser\n", 0, 0, 0 );
-	return -1;
-}
-
-static int 
-my_ber_scanf_attr (BerElement *ber, Slapi_Attr **attr, PRBool *deleted)
-{
-    char *attrtype = NULL;
-	CSN *attr_deletion_csn = NULL;
-    PRBool val_deleted;
-    char *lasti;
-    unsigned long len;
-	unsigned long tag;
-    char *str;
-    int rc;
-    Slapi_Value *value;
-
-	LDAPDebug( LDAP_DEBUG_TRACE, "=> my_ber_scanf_attr\n", 0, 0, 0 );
-
-    PR_ASSERT (ber && attr && deleted);
-
-    /* allocate the attribute */
-    *attr = slapi_attr_new ();
-    if (attr == NULL)
-    {
-        goto loser;
-    }
-
-	if (ber_scanf(ber, "{a", &attrtype) == -1) /* Begin sequence for this attr */
-	{
-		goto loser;
-	}
-
-
-    slapi_attr_init(*attr, attrtype);
-    slapi_ch_free ((void **)&attrtype);
-
-	/* The attribute deletion CSN is next and is optional? */
-    if (ber_peek_tag(ber, &len) == LBER_OCTETSTRING)
-    {
-	    if (ber_scanf(ber, "a", &str) == -1)
-	    {
-		    goto loser;
-	    }
-	    attr_deletion_csn = csn_new_by_string(str);
-	    slapi_ch_free((void **)&str);
-    }
-
-    if (attr_deletion_csn)
-	{
-		rc = attr_set_deletion_csn(*attr, attr_deletion_csn);
-        csn_free (&attr_deletion_csn);
-        if (rc != 0)
-        {
-            goto loser;
-        }
-	}
-
-	/* The "attribute deleted" flag is next, and is optional */
-	if (ber_peek_tag(ber, &len) == LBER_BOOLEAN)
-	{
-		if (ber_scanf(ber, "b", deleted) == -1)
-		{
-			goto loser;
-		}
-	} 
-    else /* default is present */
-    {
-		*deleted = PR_FALSE;
-	}
-	
-    /* loop over the list of attribute values */
-	for (tag = ber_first_element(ber, &len, &lasti);
-		tag != LBER_ERROR && tag != LBER_END_OF_SEQORSET;
-		tag = ber_next_element(ber, &len, lasti))
-	{
-
-		value = NULL;		
-		if (my_ber_scanf_value(ber, &value, &val_deleted) == -1)
-		{
-			goto loser;
-		}
-
-        if (val_deleted)
-        {
-			/* Add the value to the attribute */
-			if (attr_add_deleted_value(*attr, value) == -1) /* attr has ownership of value */
-			{
-				goto loser;
-			}
-        }
-        else
-        {
-            /* Add the value to the attribute */
-			if (slapi_attr_add_value(*attr, value) == -1) /* attr has ownership of value */
-			{
-				goto loser;
-			}
-        }
-		if (value)
-			slapi_value_free(&value);
-	}	
-
-	if (ber_scanf(ber, "}") == -1) /* End sequence for this attribute */
-	{
-		goto loser;
-	}
-
-	LDAPDebug( LDAP_DEBUG_TRACE, "<= my_ber_scanf_attr\n", 0, 0, 0 );
-    return 0;
-loser:
-    if (*attr)
-        slapi_attr_free (attr);
-    if (value)
-        slapi_value_free (&value);
-
-	LDAPDebug( LDAP_DEBUG_TRACE, "<= my_ber_scanf_attr - loser\n", 0, 0, 0 );
-    return -1;    
-}
-
-/*
- * Extract the payload from a total update extended operation,
- * decode it, and produce a Slapi_Entry structure representing a new
- * entry to be added to the local database.
- */
-static int
-decode_total_update_extop(Slapi_PBlock *pb, Slapi_Entry **ep)
-{
-	BerElement *tmp_bere = NULL;
-	Slapi_Entry *e = NULL;
-    Slapi_Attr *attr = NULL;
-	char *str = NULL;
-	CSN *dn_csn = NULL;
-	struct berval *extop_value = NULL;
-	char *extop_oid = NULL;
-	unsigned long len;
-	char *lasto;
-	unsigned long tag;
-	int rc;
-    PRBool deleted;
-
-	LDAPDebug( LDAP_DEBUG_TRACE, "=> decode_total_update_extop\n", 0, 0, 0 );
-	
-	PR_ASSERT(NULL != pb);
-	PR_ASSERT(NULL != ep);
-
-	slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &extop_oid);
-	slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_value);
-
-	if (NULL == extop_oid ||
-		strcmp(extop_oid, REPL_NSDS50_REPLICATION_ENTRY_REQUEST_OID) != 0 ||
-		NULL == extop_value)
-	{
-		/* Bogus */
-		goto loser;
-	}
-
-	if ((tmp_bere = ber_init(extop_value)) == NULL)
-	{
-		goto loser;
-	}
-
-	if ((e = slapi_entry_alloc()) == NULL)
-	{
-		goto loser;
-	}
-
-	if (ber_scanf(tmp_bere, "{") == -1) /* Begin outer sequence */
-	{
-		goto loser;
-	}
-
-	/* The entry's uniqueid is first */
-	if (ber_scanf(tmp_bere, "a", &str) == -1)
-	{
-		goto loser;
-	}
-	slapi_entry_set_uniqueid(e, str);
-	str = NULL;	/* Slapi_Entry now owns the uniqueid */
-
-	/* The entry's DN is next */
-	if (ber_scanf(tmp_bere, "a", &str) == -1)
-	{
-		goto loser;
-	}
-	slapi_entry_set_dn(e, str);
-	str = NULL; /* Slapi_Entry now owns the dn */
-
-	/* Get the attributes */
-	for ( tag = ber_first_element( tmp_bere, &len, &lasto );
-		tag != LBER_ERROR && tag != LBER_END_OF_SEQORSET;
-		tag = ber_next_element( tmp_bere, &len, lasto ) )
-	{
-
-        if (my_ber_scanf_attr (tmp_bere, &attr, &deleted) != 0)
-        {
-            goto loser;
-        }
-		
-	    /* Add the attribute to the entry */
-        if (deleted)
-            entry_add_deleted_attribute_wsi(e, attr); /* entry now owns attr */
-        else
-		    entry_add_present_attribute_wsi(e, attr); /* entry now owns attr */
-        attr = NULL;
-	}
-
-    if (ber_scanf(tmp_bere, "}") == -1) /* End sequence for this entry */
-	{
-		goto loser;
-	}
-
-	/* Check for ldapsubentries and tombstone entries to set flags properly */
-	slapi_entry_attr_find(e, "objectclass", &attr);
-	if (attr != NULL) {
-		struct berval bv;
-		bv.bv_val = "ldapsubentry";
-		bv.bv_len = strlen(bv.bv_val);
-		if (slapi_attr_value_find(attr, &bv) == 0) {
-			slapi_entry_set_flag(e, SLAPI_ENTRY_LDAPSUBENTRY);
-		}
-		bv.bv_val = SLAPI_ATTR_VALUE_TOMBSTONE;
-		bv.bv_len = strlen(bv.bv_val);
-		if (slapi_attr_value_find(attr, &bv) == 0) {
-			slapi_entry_set_flag(e, SLAPI_ENTRY_FLAG_TOMBSTONE);
-		}
-	}
-	
-	/* If we get here, the entry is properly constructed. Return it. */
-
-	rc = 0;
-	*ep = e;
-	goto free_and_return;
-
-loser:
-	rc = -1;
-	/* slapi_ch_free accepts NULL pointer */
-	slapi_ch_free((void **)&str);
-
-	if (NULL != dn_csn)
-	{
-		csn_free(&dn_csn);
-	}
-    if (attr != NULL)
-    {
-        slapi_attr_free (&attr);
-    }
-    
-    if (NULL != e)
-    {
-        slapi_entry_free (e);
-    }
-	*ep = NULL;
-	slapi_log_error(SLAPI_LOG_FATAL, windows_repl_plugin_name, "Error: could not decode extended "
-		"operation containing entry for total update.\n");
-
-free_and_return:
-    if (NULL != tmp_bere)
-	{
-		ber_free(tmp_bere, 1); 
-		tmp_bere = NULL;
-	}
-	LDAPDebug( LDAP_DEBUG_TRACE, "<= decode_total_update_extop\n", 0, 0, 0 );
-	return rc;
-}
-
-/*
- * This plugin entry point is called whenever an NSDS50ReplicationEntry
- * extended operation is received.
- */
-int
-___multimaster_extop_NSDS50ReplicationEntry(Slapi_PBlock  *pb)
-{
-	int rc;
-	Slapi_Entry *e = NULL;
-    Slapi_Connection *conn = NULL;
-	int connid, opid;
-
-	LDAPDebug( LDAP_DEBUG_TRACE, "=> ___multimaster_extop_NSDS50ReplicationEntry\n", 0, 0, 0 );
-	
-	connid = 0;
-	slapi_pblock_get(pb, SLAPI_CONN_ID, &connid);
-	opid = 0;
-	slapi_pblock_get(pb, SLAPI_OPERATION_ID, &opid);
-
-	/* Decode the extended operation */
-	rc = decode_total_update_extop(pb, &e);
-
-	if (0 == rc)
-	{
-#ifdef notdef
-		/*
-		 * Just spew LDIF so we're sure we got it right. Later we'll firehose
-		 * this into the database import code
-		 */
-		int len;
-		char *str = slapi_entry2str_with_options(e, &len,SLAPI_DUMP_UNIQUEID);
-		puts(str);
-		free(str);
-#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
-        */
-       if ((rc != LDAP_SUCCESS) && (rc != LDAP_BUSY))
-	   {
-		   const char *dn = slapi_entry_get_dn_const(e);
-		   slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
-						   "Error %d: could not import entry dn %s "
-						   "for total update operation conn=%d op=%d\n",
-						   rc, dn, connid, opid);
-		   rc = -1;
-	   }
-        
-	}
-	else
-	{
-		slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
-						"Error %d: could not decode the total update extop "
-						"for total update operation conn=%d op=%d\n",
-						rc, connid, opid);
-	}
-   
-    if ((rc != 0) && (rc != LDAP_BUSY))
-    {
-        /* just disconnect from the supplier. bulk import is stopped when
-           connection object is destroyed */
-        slapi_pblock_get (pb, SLAPI_CONNECTION, &conn);
-        if (conn)
-        {
-            slapi_disconnect_server(conn);
-        }
-
-        /* cleanup */
-        if (e)
-        {
-            slapi_entry_free (e);
-        }
-    }
-
-	LDAPDebug( LDAP_DEBUG_TRACE, "<= ___multimaster_extop_NSDS50ReplicationEntry\n", 0, 0, 0 );
-
-	return rc;
-}