Add ldap_*2name() in <include,libldap>/schema, use them in slapd/schema

[openldap] / servers / slapd / repl.c

diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index c1bcff91d526c8ab68e7d7054be00167d854b8ca..8f8b6439221e8c499a3e2e655c588532176c4082 100644 (file)
--- a/servers/slapd/repl.c
+++ b/servers/slapd/repl.c
@@ -1,4 +1,8 @@
 /* repl.c - log modifications for replication purposes */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -8,7 +12,9 @@
 #include <ac/ctype.h>
 #include <ac/socket.h>
 
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
+#endif
 
 #include "slap.h"
 
@@ -16,16 +22,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;
 
@@ -44,10 +49,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 +81,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';
@@ -96,7 +102,7 @@ replog(
                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 );
@@ -108,10 +114,13 @@ 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" );