X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Frepl.c;h=5f004475895d324afc38092aeca0cd5f10025929;hb=f89308915aabff352eb390a1e58a71127b7ebd26;hp=634cb2373d42f4ca6805809b29120c2188491853;hpb=c3323c31d53f85f1056b377d900872975e758121;p=openldap

diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index 634cb2373d..5f00447589 100644
--- a/servers/slapd/repl.c
+++ b/servers/slapd/repl.c
@@ -1,7 +1,7 @@
 /* repl.c - log modifications for replication purposes */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -77,8 +77,8 @@ void
 replog(
     Backend	*be,
     Operation *op,
-    char	*dn,
-    char	*ndn,
+    struct berval *dn,
+    struct berval *ndn,
     void	*change
 )
 {
@@ -104,14 +104,13 @@ replog(
 		return;
 	}
 
-	for ( i = 0; be->be_replica != NULL && be->be_replica[i] != NULL;
-	    i++ ) {
+	for ( i = 0; be->be_replica != NULL && be->be_replica[i] != NULL; i++ ) {
 		/* check if dn's suffix matches legal suffixes, if any */
 		if ( be->be_replica[i]->ri_nsuffix != NULL ) {
 			int j;
 
 			for ( j = 0; be->be_replica[i]->ri_nsuffix[j]; j++ ) {
-				if ( dn_issuffix( ndn, be->be_replica[i]->ri_nsuffix[j]->bv_val ) ) {
+				if ( dnIsSuffix( ndn, be->be_replica[i]->ri_nsuffix[j] ) ) {
 					break;
 				}
 			}
@@ -140,7 +139,7 @@ replog(
 #endif
 
 	fprintf( fp, "time: %ld\n", (long) slap_get_time() );
-	fprintf( fp, "dn: %s\n", dn );
+	fprintf( fp, "dn: %s\n", dn->bv_val );
 
 	switch ( op->o_tag ) {
 	case LDAP_REQ_EXTENDED:
@@ -153,6 +152,7 @@ replog(
 		ml = change;
 		for ( ; ml != NULL; ml = ml->sml_next ) {
 			char *type;
+			struct berval *bv;
 			type = ml->sml_desc->ad_cname.bv_val;
 			switch ( ml->sml_op ) {
 			case LDAP_MOD_ADD:
@@ -168,20 +168,18 @@ replog(
 				break;
 			}
 
-			for ( i = 0; ml->sml_bvalues != NULL &&
-			    ml->sml_bvalues[i] != NULL; i++ ) {
+			for ( bv = ml->sml_bvalues; bv && bv->bv_val; bv++ )
+			{
 				char	*buf, *bufp;
 
 				len = ml->sml_desc->ad_cname.bv_len;
 				len = LDIF_SIZE_NEEDED( len,
-				    ml->sml_bvalues[i]->bv_len ) + 1;
+				    bv->bv_len ) + 1;
 				buf = (char *) ch_malloc( len );
 
 				bufp = buf;
-				ldif_sput( &bufp, LDIF_PUT_VALUE,
-					type,
-				    ml->sml_bvalues[i]->bv_val,
-				    ml->sml_bvalues[i]->bv_len );
+				ldif_sput( &bufp, LDIF_PUT_VALUE, type,
+				    bv->bv_val, bv->bv_len );
 				*bufp = '\0';
 
 				fputs( buf, fp );