If dn2id returns ID but id2entry returns NULL, log it.

[openldap] / servers / slapd / repl.c

diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index 4450be586654bea2683ca1ae67143c6e6ae12490..f0f8818a3c3bd4ae35fefd0d917d9ecf2452265b 100644 (file)
--- a/servers/slapd/repl.c
+++ b/servers/slapd/repl.c
@@ -5,21 +5,13 @@
 #include <stdio.h>
 
 #include <ac/string.h>
+#include <ac/ctype.h>
 #include <ac/socket.h>
 
 #include <sys/file.h>
 
 #include "slap.h"
 
-extern pthread_mutex_t replog_mutex;
-extern pthread_mutex_t entry2str_mutex;
-extern time_t          currenttime;
-extern char            *replogfile;
-
-extern FILE    *lock_fopen();
-extern int     lock_fclose();
-extern char    *ch_malloc();
-extern char    *entry2str();
 
 void
 replog(
@@ -30,7 +22,7 @@ replog(
     int                flag
 )
 {
-       LDAPMod *mods;
+       LDAPModList     *ml;
        Entry   *e;
        char    *newrdn, *tmp;
        int     deleteoldrdn;
@@ -52,41 +44,41 @@ replog(
            i++ ) {
                fprintf( fp, "replica: %s\n", be->be_replica[i] );
        }
-       fprintf( fp, "time: %ld\n", currenttime );
+       fprintf( fp, "time: %ld\n", (long) currenttime );
        fprintf( fp, "dn: %s\n", dn );
 
        switch ( optype ) {
        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->ml_next ) {
+                       switch ( ml->ml_op & ~LDAP_MOD_BVALUES ) {
                        case LDAP_MOD_ADD:
-                               fprintf( fp, "add: %s\n", mods->mod_type );
+                               fprintf( fp, "add: %s\n", ml->ml_type );
                                break;
 
                        case LDAP_MOD_DELETE:
-                               fprintf( fp, "delete: %s\n", mods->mod_type );
+                               fprintf( fp, "delete: %s\n", ml->ml_type );
                                break;
 
                        case LDAP_MOD_REPLACE:
-                               fprintf( fp, "replace: %s\n", mods->mod_type );
+                               fprintf( fp, "replace: %s\n", ml->ml_type );
                                break;
                        }
 
-                       for ( i = 0; mods->mod_bvalues != NULL &&
-                           mods->mod_bvalues[i] != NULL; i++ ) {
+                       for ( i = 0; ml->ml_bvalues != NULL &&
+                           ml->ml_bvalues[i] != NULL; i++ ) {
                                char    *buf, *bufp;
 
-                               len = strlen( mods->mod_type );
+                               len = strlen( ml->ml_type );
                                len = LDIF_SIZE_NEEDED( len,
-                                   mods->mod_bvalues[i]->bv_len ) + 1;
-                               buf = ch_malloc( len );
+                                   ml->ml_bvalues[i]->bv_len ) + 1;
+                               buf = (char *) ch_malloc( len );
 
                                bufp = buf;
-                               put_type_and_value( &bufp, mods->mod_type,
-                                   mods->mod_bvalues[i]->bv_val,
-                                   mods->mod_bvalues[i]->bv_len );
+                               ldif_put_type_and_value( &bufp, ml->ml_type,
+                                   ml->ml_bvalues[i]->bv_val,
+                                   ml->ml_bvalues[i]->bv_len );
                                *bufp = '\0';
 
                                fputs( buf, fp );