Removed unnecessary definition that is already in core.schema.

[openldap] / servers / slapd / repl.c

diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index 4f46ec114d317d20415957bcae3039d087254e51..0c3f04a7cf5a8072aae3ef5ce1e44a2ec0febbff 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"
 
@@ -22,10 +24,9 @@ replog(
     int                flag
 )
 {
-       LDAPMod *mods;
+       LDAPModList     *ml;
        Entry   *e;
        char    *newrdn, *tmp;
-       int     deleteoldrdn;
        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,41 +45,41 @@ replog(
            i++ ) {
                fprintf( fp, "replica: %s\n", be->be_replica[i] );
        }
-       fprintf( fp, "time: %ld\n", currenttime );
+       fprintf( fp, "time: %ld\n", (long) slap_get_time() );
        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;
+                                   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 );
@@ -92,15 +93,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:
@@ -116,5 +117,5 @@ replog(
        fprintf( fp, "\n" );
 
        lock_fclose( fp, lfp );
-       pthread_mutex_unlock( &replog_mutex );
+       ldap_pvt_thread_mutex_unlock( &replog_mutex );
 }