X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fldapsync.c;h=c0b916193666aa78780447c2de20611ae3e09564;hb=62b6b326338d5162b0f570eaeb8a227fbc5a9c62;hp=2d87f64fa4ed706cb0df10c20f94840a6385f426;hpb=f2a9089e4df315608a18b42daf999cd40791abf6;p=openldap

diff --git a/servers/slapd/ldapsync.c b/servers/slapd/ldapsync.c
index 2d87f64fa4..c0b9161936 100644
--- a/servers/slapd/ldapsync.c
+++ b/servers/slapd/ldapsync.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003 The OpenLDAP Foundation.
+ * Copyright 2003-2004 The OpenLDAP Foundation.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
  *
@@ -22,7 +22,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_pvt.h"
 #include "lutil.h"
 #include "slap.h"
 #include "../../libraries/liblber/lber-int.h" /* get ber_strndup() */
@@ -54,12 +53,12 @@ slap_build_sync_state_ctrl(
 	BerElementBuffer berbuf;
 	BerElement *ber = (BerElement *)&berbuf;
 
-	struct berval entryuuid_bv	= { 0, NULL };
+	struct berval entryuuid_bv	= BER_BVNULL;
 
 	ber_init2( ber, 0, LBER_USE_DER );
 	ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx );
 
-	ctrls[num_ctrls] = sl_malloc ( sizeof ( LDAPControl ), op->o_tmpmemctx );
+	ctrls[num_ctrls] = slap_sl_malloc ( sizeof ( LDAPControl ), op->o_tmpmemctx );
 
 	for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
 		AttributeDescription *desc = a->a_desc;
@@ -86,15 +85,9 @@ slap_build_sync_state_ctrl(
 	ber_free_buf( ber );
 
 	if ( ret < 0 ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG ( OPERATION, RESULTS, 
-			"slap_build_sync_ctrl: ber_flatten2 failed\n",
-			0, 0, 0 );
-#else
 		Debug( LDAP_DEBUG_TRACE,
 			"slap_build_sync_ctrl: ber_flatten2 failed\n",
 			0, 0, 0 );
-#endif
 		send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
 		return ret;
 	}
@@ -137,15 +130,9 @@ slap_build_sync_done_ctrl(
 	ber_free_buf( ber );
 
 	if ( ret < 0 ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG ( OPERATION, RESULTS, 
-			"slap_build_sync_done_ctrl: ber_flatten2 failed\n",
-			0, 0, 0 );
-#else
 		Debug( LDAP_DEBUG_TRACE,
 			"slap_build_sync_done_ctrl: ber_flatten2 failed\n",
 			0, 0, 0 );
-#endif
 		send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
 		return ret;
 	}
@@ -173,7 +160,7 @@ slap_build_sync_state_ctrl_from_slog(
 	BerElementBuffer berbuf;
 	BerElement *ber = (BerElement *)&berbuf;
 
-	struct berval entryuuid_bv	= { 0, NULL };
+	struct berval entryuuid_bv	= BER_BVNULL;
 
 	ber_init2( ber, NULL, LBER_USE_DER );
 	ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx );
@@ -200,15 +187,9 @@ slap_build_sync_state_ctrl_from_slog(
 	ber_free_buf( ber );
 
 	if ( ret < 0 ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG ( OPERATION, RESULTS, 
-			"slap_build_sync_ctrl: ber_flatten2 failed\n",
-			0, 0, 0 );
-#else
 		Debug( LDAP_DEBUG_TRACE,
 			"slap_build_sync_ctrl: ber_flatten2 failed\n",
 			0, 0, 0 );
-#endif
 		send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
 		return ret;
 	}
@@ -263,15 +244,9 @@ slap_send_syncinfo(
 			ber_printf( ber, "N}" );
 			break;
 		default:
-#ifdef NEW_LOGGING
-			LDAP_LOG ( OPERATION, RESULTS,
-				"slap_send_syncinfo: invalid syncinfo type (%d)\n",
-				type, 0, 0 );
-#else
 			Debug( LDAP_DEBUG_TRACE,
 				"slap_send_syncinfo: invalid syncinfo type (%d)\n",
 				type, 0, 0 );
-#endif
 			return LDAP_OTHER;
 		}
 	}
@@ -279,15 +254,9 @@ slap_send_syncinfo(
 	ret = ber_flatten2( ber, &rspdata, 0 );
 
 	if ( ret < 0 ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG ( OPERATION, RESULTS,
-			"slap_send_syncinfo: ber_flatten2 failed\n",
-			0, 0, 0 );
-#else
 		Debug( LDAP_DEBUG_TRACE,
 			"slap_send_syncinfo: ber_flatten2 failed\n",
 			0, 0, 0 );
-#endif
 		send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
 		return ret;
 	}
@@ -444,9 +413,9 @@ slap_init_sync_cookie_ctxcsn(
 )
 {
 	char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE + 4 ];
-	struct berval octet_str = { 0, NULL };
-	struct berval ctxcsn = { 0, NULL };
-	struct berval ctxcsn_dup = { 0, NULL };
+	struct berval octet_str = BER_BVNULL;
+	struct berval ctxcsn = BER_BVNULL;
+	struct berval ctxcsn_dup = BER_BVNULL;
 	struct berval slap_syncCookie;
 
 	if ( cookie == NULL )
@@ -523,7 +492,7 @@ slap_build_syncUUID_set(
 	int ret;
 	Attribute* a;
 
-	struct berval entryuuid_bv	= { 0, NULL };
+	struct berval entryuuid_bv	= BER_BVNULL;
 
 	for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
 		AttributeDescription *desc = a->a_desc;