ITS#6768

diff --git a/CHANGES b/CHANGES
index 2d97c14fe0d3ccffd3f214a7273b622c4ead059a..ff643d0e47ba1ed94b948ab77b387aaa1dbb77cc 100644 (file)
--- 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 e2e4bf00ce029503ab109d0fb8e7df7164c469b4..562da721c8091cc5f2161d18cdc82f9b9ed3432e 100644 (file)
--- 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 ) ) {