Fix modrdn

diff --git a/servers/slapd/back-passwd/search.c b/servers/slapd/back-passwd/search.c
index 7143f90088c3931044b12a22b190f9d8fa1944c6..8a05ce281a129ce2166aeff04ccab8e0c3b92af4 100644 (file)
--- a/servers/slapd/back-passwd/search.c
+++ b/servers/slapd/back-passwd/search.c
@@ -74,7 +74,7 @@ passwd_back_search(
                vals[0] = &val;
                vals[1] = NULL;
 
-               matched = base;
+               matched = (char *) base;
 
                if( scope != LDAP_SCOPE_ONELEVEL ) {
                        char *type;

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 15f88529ea0bf105720bddd1f8df5b8528d7a42c..5160f1e89227babfc2edce9ea07e4ac2c990212e 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -363,6 +363,9 @@ do_modrdn(
 
                        goto cleanup;
                }
+
+               /* deref suffix alias if appropriate */
+               suffix_alias( be, nnewSuperior );
        }
 
        /* deref suffix alias if appropriate */

diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index 6007de18e0fe1a4246294b41a81cfaf93a293784..634cb2373d42f4ca6805809b29120c2188491853 100644 (file)
--- a/servers/slapd/repl.c
+++ b/servers/slapd/repl.c
@@ -213,7 +213,7 @@ replog(
        case LDAP_REQ_MODRDN:
                moddn = change;
                fprintf( fp, "changetype: modrdn\n" );
-               fprintf( fp, "newrdn: %s\n", moddn->newrdn );
+               fprintf( fp, "newrdn: %s\n", moddn->newrdn->bv_val );
                fprintf( fp, "deleteoldrdn: %d\n", moddn->deloldrdn ? 1 : 0 );
                if( moddn->newsup != NULL ) {
                        fprintf( fp, "newsuperior: %s\n", moddn->newsup->bv_val );