From 3635dc43afd36604821133bbe866b0423224fe24 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Tue, 4 Jan 2011 20:44:43 +0000 Subject: [PATCH] ITS#6768 --- CHANGES | 1 + servers/slapd/modrdn.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 2d97c14fe0..ff643d0e47 100644 --- a/CHANGES +++ b/CHANGES @@ -42,6 +42,7 @@ OpenLDAP 2.4.24 Engineering Fixed slapd extensible match for ordering rules (ITS#6532) Fixed slapd when first acl is value dependent (ITS#6693) Fixed slapd modify to return actual error (ITS#6581) + Fixed slapd modrdn with empty DN (ITS#6768) Fixed slapd sortvals of attributes with 1 value (ITS#6715) Fixed slapd syncrepl reuse of presence list (ITS#6707) Fixed slapd syncrepl unitialized return code (ITS#6719) diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c index e2e4bf00ce..562da721c8 100644 --- a/servers/slapd/modrdn.c +++ b/servers/slapd/modrdn.c @@ -392,7 +392,9 @@ slap_modrdn2mods( LDAPRDN new_rdn = NULL; assert( !BER_BVISEMPTY( &op->oq_modrdn.rs_newrdn ) ); - assert( !op->orr_deleteoldrdn || !BER_BVISEMPTY( &op->o_req_dn ) ); + + /* if requestDN is empty, silently reset deleteOldRDN */ + if ( BER_BVISEMPTY( &op->o_req_dn ) ) op->orr_deleteoldrdn = 0; if ( ldap_bv2rdn_x( &op->oq_modrdn.rs_newrdn, &new_rdn, (char **)&rs->sr_text, LDAP_DN_FORMAT_LDAP, op->o_tmpmemctx ) ) { -- 2.39.5