Extend value_match to extract an asserted value from a full value

[openldap] / servers / slapd / repl.c

diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index e5eddcfb8b05d437f77c5588572800578acfa5c8..e309d942cfc6cf958485eee50b1c2eb9717b0661 100644 (file)
--- a/servers/slapd/repl.c
+++ b/servers/slapd/repl.c
@@ -18,6 +18,7 @@
 #endif
 
 #include "slap.h"
+#include "ldif.h"
 
 int
 add_replica_info(
@@ -58,7 +59,11 @@ replog(
        struct replog_moddn *moddn;
        char *tmp;
        FILE    *fp, *lfp;
-       int     len, i, count = 0;
+       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;
@@ -100,10 +105,13 @@ replog(
                }
 
                fprintf( fp, "replica: %s\n", be->be_replica[i]->ri_host );
+#ifdef NO_LOG_WHEN_NO_REPLICAS
                ++count;
+#endif
        }
 
        ch_free( tmp );
+#ifdef NO_LOG_WHEN_NO_REPLICAS
        if ( count == 0 ) {
                /* if no replicas matched, drop the log 
                 * (should we log it anyway?) */
@@ -112,6 +120,7 @@ replog(
 
                return;
        }
+#endif
 
        fprintf( fp, "time: %ld\n", (long) slap_get_time() );
        fprintf( fp, "dn: %s\n", dn );
@@ -127,7 +136,7 @@ replog(
                ml = change;
                for ( ; ml != NULL; ml = ml->sml_next ) {
                        char *type;
-                       type = ml->sml_desc->ad_cname->bv_val;
+                       type = ml->sml_desc->ad_cname.bv_val;
                        switch ( ml->sml_op ) {
                        case LDAP_MOD_ADD:
                                fprintf( fp, "add: %s\n", type );