Factor out ldif2* intialization to ldif2common.c

[openldap] / servers / slapd / repl.c

diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index f0f8818a3c3bd4ae35fefd0d917d9ecf2452265b..122872f92bd42a5ebe2eb49fa53e044396739b96 100644 (file)
--- a/servers/slapd/repl.c
+++ b/servers/slapd/repl.c
@@ -8,7 +8,9 @@
 #include <ac/ctype.h>
 #include <ac/socket.h>
 
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
+#endif
 
 #include "slap.h"
 
@@ -16,16 +18,15 @@
 void
 replog(
     Backend    *be,
-    int                optype,
+    Operation *op,
     char       *dn,
-    void       *change,
-    int                flag
+    void       *change
 )
 {
        LDAPModList     *ml;
        Entry   *e;
-       char    *newrdn, *tmp;
-       int     deleteoldrdn;
+       struct replog_moddn *moddn;
+       char *tmp;
        FILE    *fp, *lfp;
        int     len, i;
 
@@ -33,10 +34,10 @@ replog(
                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;
        }
 
@@ -44,10 +45,10 @@ replog(
            i++ ) {
                fprintf( fp, "replica: %s\n", be->be_replica[i] );
        }
-       fprintf( fp, "time: %ld\n", (long) currenttime );
+       fprintf( fp, "time: %ld\n", (long) slap_get_time() );
        fprintf( fp, "dn: %s\n", dn );
 
-       switch ( optype ) {
+       switch ( op->o_tag ) {
        case LDAP_REQ_MODIFY:
                fprintf( fp, "changetype: modify\n" );
                ml = change;
@@ -76,7 +77,8 @@ replog(
                                buf = (char *) ch_malloc( len );
 
                                bufp = buf;
-                               ldif_put_type_and_value( &bufp, ml->ml_type,
+                               ldif_sput( &bufp, LDIF_PUT_VALUE,
+                                       ml->ml_type,
                                    ml->ml_bvalues[i]->bv_val,
                                    ml->ml_bvalues[i]->bv_len );
                                *bufp = '\0';
@@ -92,15 +94,15 @@ replog(
        case LDAP_REQ_ADD:
                e = change;
                fprintf( fp, "changetype: add\n" );
-               pthread_mutex_lock( &entry2str_mutex );
+               ldap_pvt_thread_mutex_lock( &entry2str_mutex );
                tmp = entry2str( e, &len, 0 );
                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 +110,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 );
+               fprintf( fp, "deleteoldrdn: %d\n", moddn->deloldrdn ? 1 : 0 );
+               if( moddn->newsup != NULL ) {
+                       fprintf( fp, "newsuperior: %s\n", moddn->newsup );
+               }
        }
        fprintf( fp, "\n" );
 
        lock_fclose( fp, lfp );
-       pthread_mutex_unlock( &replog_mutex );
+       ldap_pvt_thread_mutex_unlock( &replog_mutex );
 }