]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/repl.c
Add a default case with assert() just in case.
[openldap] / servers / slapd / repl.c
index 0961e30f25ad5d47d893df53381040f0adfd536a..5f004475895d324afc38092aeca0cd5f10025929 100644 (file)
@@ -1,4 +1,9 @@
 /* repl.c - log modifications for replication purposes */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
 #include <ac/ctype.h>
 #include <ac/socket.h>
 
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
+#endif
 
 #include "slap.h"
+#include "ldif.h"
 
+int
+add_replica_info(
+    Backend     *be,
+    const char  *host 
+)
+{
+       int i = 0;
+
+       assert( be );
+       assert( host );
+
+       if ( be->be_replica != NULL ) {
+               for ( ; be->be_replica[ i ] != NULL; i++ );
+       }
+               
+       be->be_replica = ch_realloc( be->be_replica, 
+               sizeof( struct slap_replica_info * )*( i + 2 ) );
+
+       be->be_replica[ i ] 
+               = ch_calloc( sizeof( struct slap_replica_info ), 1 );
+       be->be_replica[ i ]->ri_host = ch_strdup( host );
+       be->be_replica[ i + 1 ] = NULL;
+
+       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,
-    int                optype,
-    char       *dn,
-    void       *change,
-    int                flag
+    Operation *op,
+    struct berval *dn,
+    struct berval *ndn,
+    void       *change
 )
 {
-       LDAPMod *mods;
+       Modifications   *ml;
        Entry   *e;
-       char    *newrdn, *tmp;
-       int     deleteoldrdn;
+       struct slap_replog_moddn *moddn;
+       char *tmp;
        FILE    *fp, *lfp;
        int     len, i;
+/* undef NO_LOG_WHEN_NO_REPLICAS */
+#ifdef NO_LOG_WHEN_NO_REPLICAS
+       int     count = 0;
+#endif
 
        if ( be->be_replogfile == NULL && replogfile == NULL ) {
                return;
        }
 
-       pthread_mutex_lock( &replog_mutex );
+       ldap_pvt_thread_mutex_lock( &replog_mutex );
        if ( (fp = lock_fopen( be->be_replogfile ? be->be_replogfile :
            replogfile, "a", &lfp )) == NULL ) {
-               pthread_mutex_unlock( &replog_mutex );
+               ldap_pvt_thread_mutex_unlock( &replog_mutex );
                return;
        }
 
-       for ( i = 0; be->be_replica != NULL && be->be_replica[i] != NULL;
-           i++ ) {
-               fprintf( fp, "replica: %s\n", be->be_replica[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 ( dnIsSuffix( ndn, be->be_replica[i]->ri_nsuffix[j] ) ) {
+                                       break;
+                               }
+                       }
+
+                       if ( !be->be_replica[i]->ri_nsuffix[j] ) {
+                               /* do not add "replica:" line */
+                               continue;
+                       }
+               }
+
+               fprintf( fp, "replica: %s\n", be->be_replica[i]->ri_host );
+#ifdef NO_LOG_WHEN_NO_REPLICAS
+               ++count;
+#endif
        }
-       fprintf( fp, "time: %ld\n", (long) currenttime );
-       fprintf( fp, "dn: %s\n", dn );
 
-       switch ( optype ) {
+#ifdef NO_LOG_WHEN_NO_REPLICAS
+       if ( count == 0 ) {
+               /* if no replicas matched, drop the log 
+                * (should we log it anyway?) */
+               lock_fclose( fp, lfp );
+               ldap_pvt_thread_mutex_unlock( &replog_mutex );
+
+               return;
+       }
+#endif
+
+       fprintf( fp, "time: %ld\n", (long) slap_get_time() );
+       fprintf( fp, "dn: %s\n", dn->bv_val );
+
+       switch ( op->o_tag ) {
+       case LDAP_REQ_EXTENDED:
+               /* quick hack for extended operations */
+               /* assume change parameter is a Modfications* */
+               /* fall thru */
+
        case LDAP_REQ_MODIFY:
                fprintf( fp, "changetype: modify\n" );
-               mods = change;
-               for ( ; mods != NULL; mods = mods->mod_next ) {
-                       switch ( mods->mod_op & ~LDAP_MOD_BVALUES ) {
+               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:
-                               fprintf( fp, "add: %s\n", mods->mod_type );
+                               fprintf( fp, "add: %s\n", type );
                                break;
 
                        case LDAP_MOD_DELETE:
-                               fprintf( fp, "delete: %s\n", mods->mod_type );
+                               fprintf( fp, "delete: %s\n", type );
                                break;
 
                        case LDAP_MOD_REPLACE:
-                               fprintf( fp, "replace: %s\n", mods->mod_type );
+                               fprintf( fp, "replace: %s\n", type );
                                break;
                        }
 
-                       for ( i = 0; mods->mod_bvalues != NULL &&
-                           mods->mod_bvalues[i] != NULL; i++ ) {
+                       for ( bv = ml->sml_bvalues; bv && bv->bv_val; bv++ )
+                       {
                                char    *buf, *bufp;
 
-                               len = strlen( mods->mod_type );
+                               len = ml->sml_desc->ad_cname.bv_len;
                                len = LDIF_SIZE_NEEDED( len,
-                                   mods->mod_bvalues[i]->bv_len ) + 1;
+                                   bv->bv_len ) + 1;
                                buf = (char *) ch_malloc( len );
 
                                bufp = buf;
-                               ldif_put_type_and_value( &bufp, mods->mod_type,
-                                   mods->mod_bvalues[i]->bv_val,
-                                   mods->mod_bvalues[i]->bv_len );
+                               ldif_sput( &bufp, LDIF_PUT_VALUE, type,
+                                   bv->bv_val, bv->bv_len );
                                *bufp = '\0';
 
                                fputs( buf, fp );
@@ -92,15 +193,15 @@ replog(
        case LDAP_REQ_ADD:
                e = change;
                fprintf( fp, "changetype: add\n" );
-               pthread_mutex_lock( &entry2str_mutex );
-               tmp = entry2str( e, &len, 0 );
+               ldap_pvt_thread_mutex_lock( &entry2str_mutex );
+               tmp = entry2str( e, &len );
                while ( (tmp = strchr( tmp, '\n' )) != NULL ) {
                        tmp++;
-                       if ( ! isspace( *tmp ) )
+                       if ( ! isspace( (unsigned char) *tmp ) )
                                break;
                }
                fprintf( fp, "%s", tmp );
-               pthread_mutex_unlock( &entry2str_mutex );
+               ldap_pvt_thread_mutex_unlock( &entry2str_mutex );
                break;
 
        case LDAP_REQ_DELETE:
@@ -108,13 +209,16 @@ replog(
                break;
 
        case LDAP_REQ_MODRDN:
-               newrdn = change;
+               moddn = change;
                fprintf( fp, "changetype: modrdn\n" );
-               fprintf( fp, "newrdn: %s\n", newrdn );
-               fprintf( fp, "deleteoldrdn: %d\n", flag ? 1 : 0 );
+               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->bv_val );
+               }
        }
        fprintf( fp, "\n" );
 
        lock_fclose( fp, lfp );
-       pthread_mutex_unlock( &replog_mutex );
+       ldap_pvt_thread_mutex_unlock( &replog_mutex );
 }