Add a default case with assert() just in case.

[openldap] / servers / slapd / repl.c

diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index 7b0b9a3f996b9c3b390d4535d93baf7c9fbf7261..5f004475895d324afc38092aeca0cd5f10025929 100644 (file)
--- 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
  */
 
@@ -18,6 +18,7 @@
 #endif
 
 #include "slap.h"
+#include "ldif.h"
 
 int
 add_replica_info(
@@ -45,17 +46,45 @@ add_replica_info(
        return( i );
 }
 
+int
+add_replica_suffix(
+    Backend     *be,
+    int                nr,
+    const char  *suffix
+)
+{
+       struct berval dn, *ndn = NULL;
+       int rc;
+
+       dn.bv_val = (char *) suffix;
+       dn.bv_len = strlen( dn.bv_val );
+
+       rc = dnNormalize( NULL, &dn, &ndn );
+       if( rc != LDAP_SUCCESS ) {
+               return 2;
+       }
+
+       if ( select_backend( ndn, 0, 0 ) != be ) {
+               ber_bvfree( ndn );
+               return 1;
+       }
+
+       ber_bvecadd( &be->be_replica[nr]->ri_nsuffix, ndn );
+       return 0;
+}
+
 void
 replog(
     Backend    *be,
     Operation *op,
-    char       *dn,
+    struct berval *dn,
+    struct berval *ndn,
     void       *change
 )
 {
        Modifications   *ml;
        Entry   *e;
-       struct replog_moddn *moddn;
+       struct slap_replog_moddn *moddn;
        char *tmp;
        FILE    *fp, *lfp;
        int     len, i;
@@ -75,24 +104,13 @@ replog(
                return;
        }
 
-       tmp = ch_strdup( dn );
-       if ( dn_normalize( tmp ) == NULL ) {
-               /* something has gone really bad */
-               ch_free( tmp );
-
-               lock_fclose( fp, lfp );
-               ldap_pvt_thread_mutex_unlock( &replog_mutex );
-               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( tmp, be->be_replica[i]->ri_nsuffix[j] ) ) {
+                               if ( dnIsSuffix( ndn, be->be_replica[i]->ri_nsuffix[j] ) ) {
                                        break;
                                }
                        }
@@ -109,7 +127,6 @@ replog(
 #endif
        }
 
-       ch_free( tmp );
 #ifdef NO_LOG_WHEN_NO_REPLICAS
        if ( count == 0 ) {
                /* if no replicas matched, drop the log 
@@ -122,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:
@@ -135,7 +152,8 @@ replog(
                ml = change;
                for ( ; ml != NULL; ml = ml->sml_next ) {
                        char *type;
-                       type = ml->sml_desc->ad_cname->bv_val;
+                       struct berval *bv;
+                       type = ml->sml_desc->ad_cname.bv_val;
                        switch ( ml->sml_op ) {
                        case LDAP_MOD_ADD:
                                fprintf( fp, "add: %s\n", type );
@@ -150,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 = strlen( type );
+                               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 );
@@ -195,10 +211,10 @@ replog(
        case LDAP_REQ_MODRDN:
                moddn = change;
                fprintf( fp, "changetype: modrdn\n" );
-               fprintf( fp, "newrdn: %s\n", moddn->newrdn );
+               fprintf( fp, "newrdn: %s\n", moddn->newrdn->bv_val );
                fprintf( fp, "deleteoldrdn: %d\n", moddn->deloldrdn ? 1 : 0 );
                if( moddn->newsup != NULL ) {
-                       fprintf( fp, "newsuperior: %s\n", moddn->newsup );
+                       fprintf( fp, "newsuperior: %s\n", moddn->newsup->bv_val );
                }
        }
        fprintf( fp, "\n" );