From c3323c31d53f85f1056b377d900872975e758121 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 25 Dec 2001 03:47:35 +0000 Subject: [PATCH] Fix modrdn --- servers/slapd/back-passwd/search.c | 2 +- servers/slapd/modrdn.c | 3 +++ servers/slapd/repl.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/servers/slapd/back-passwd/search.c b/servers/slapd/back-passwd/search.c index 7143f90088..8a05ce281a 100644 --- 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 15f88529ea..5160f1e892 100644 --- 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 6007de18e0..634cb2373d 100644 --- 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 ); -- 2.39.5