From: Pierangelo Masarati <ando@openldap.org>
Date: Sun, 2 Jan 2011 02:15:21 +0000 (+0000)
Subject: quick fix for null DN
X-Git-Tag: MIGRATION_CVS2GIT~289
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5c8d655bbbbb0b5392e6d9683ad49eae018722ca;p=openldap

quick fix for null DN
---

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 ) ) {