update for new backend types

[openldap] / servers / slapd / repl.c

diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index 8ebc23ac7597bee43a012d1655ac886321538dfa..cfc2cb3d3bcf5c49b84328bf67d19ca9ff615699 100644 (file)
--- a/servers/slapd/repl.c
+++ b/servers/slapd/repl.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,13 +42,14 @@
 int
 add_replica_info(
     Backend     *be,
+    const char  *uri, 
     const char  *host 
 )
 {
        int i = 0;
 
-       assert( be );
-       assert( host );
+       assert( be != NULL );
+       assert( host != NULL );
 
        if ( be->be_replica != NULL ) {
                for ( ; be->be_replica[ i ] != NULL; i++ );
@@ -59,7 +60,8 @@ add_replica_info(
 
        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 ]->ri_uri = uri;
+       be->be_replica[ i ]->ri_host = host;
        be->be_replica[ i ]->ri_nsuffix = NULL;
        be->be_replica[ i ]->ri_attrs = NULL;
        be->be_replica[ i + 1 ] = NULL;
@@ -124,8 +126,6 @@ replog1( struct slap_replica_info *ri, Operation *op, FILE *fp, long now);
 void
 replog( Operation *op )
 {
-       Modifications   *ml = NULL;
-       Attribute       *a = NULL;
        FILE    *fp, *lfp;
        int     i;
 /* undef NO_LOG_WHEN_NO_REPLICAS */
@@ -133,16 +133,18 @@ replog( Operation *op )
        int     count = 0;
 #endif
        int     subsets = 0;
-       long now = slap_get_time();
+       long    now = slap_get_time();
+       char    *replogfile;
 
-       if ( op->o_bd->be_replogfile == NULL && frontendDB->be_replogfile == NULL ) {
+       replogfile = op->o_bd->be_replogfile ? op->o_bd->be_replogfile :
+               frontendDB->be_replogfile;
+       if ( !replogfile ) {
                return;
        }
 
-       ldap_pvt_thread_mutex_lock( &SLAPD_GLOBAL(replog_mutex) );
-       if ( (fp = lock_fopen( op->o_bd->be_replogfile ? op->o_bd->be_replogfile :
-           frontendDB->be_replogfile, "a", &lfp )) == NULL ) {
-               ldap_pvt_thread_mutex_unlock( &SLAPD_GLOBAL(replog_mutex) );
+       ldap_pvt_thread_mutex_lock( &replog_mutex );
+       if ( (fp = lock_fopen( replogfile, "a", &lfp )) == NULL ) {
+               ldap_pvt_thread_mutex_unlock( &replog_mutex );
                return;
        }
 
@@ -183,7 +185,7 @@ replog( Operation *op )
                /* if no replicas matched, drop the log 
                 * (should we log it anyway?) */
                lock_fclose( fp, lfp );
-               ldap_pvt_thread_mutex_unlock( &SLAPD_GLOBAL(replog_mutex) );
+               ldap_pvt_thread_mutex_unlock( &replog_mutex );
 
                return;
        }
@@ -231,7 +233,7 @@ replog( Operation *op )
        }
 
        lock_fclose( fp, lfp );
-       ldap_pvt_thread_mutex_unlock( &SLAPD_GLOBAL(replog_mutex) );
+       ldap_pvt_thread_mutex_unlock( &replog_mutex );
 }
 
 static void
@@ -274,7 +276,7 @@ replog1(
 
        case LDAP_REQ_MODIFY:
                for ( ml = op->orm_modlist; ml != NULL; ml = ml->sml_next ) {
-                       char *did, *type = ml->sml_desc->ad_cname.bv_val;
+                       char *did = NULL, *type = ml->sml_desc->ad_cname.bv_val;
                        switch ( ml->sml_op ) {
                        case LDAP_MOD_ADD:
                                did = "add"; break;