Commit 514f605e authored by Howard Chu's avatar Howard Chu
Browse files

Fix modrdn newSuperior checks

parent d6a37432
...@@ -268,7 +268,7 @@ retry: /* transaction retry */ ...@@ -268,7 +268,7 @@ retry: /* transaction retry */
new_parent_dn = &p_dn; /* New Parent unless newSuperior given */ new_parent_dn = &p_dn; /* New Parent unless newSuperior given */
if ( newSuperior != NULL ) { if ( newSuperior->bv_val != NULL ) {
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: new parent \"%s\" requested...\n", "bdb_modrdn: new parent \"%s\" requested...\n",
newSuperior->bv_val, 0, 0 ); newSuperior->bv_val, 0, 0 );
......
...@@ -281,7 +281,7 @@ ldbm_back_modrdn( ...@@ -281,7 +281,7 @@ ldbm_back_modrdn(
new_parent_dn = &p_dn; /* New Parent unless newSuperior given */ new_parent_dn = &p_dn; /* New Parent unless newSuperior given */
if ( newSuperior != NULL ) { if ( newSuperior->bv_val != NULL ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1, LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_back_modrdn: new parent \"%s\" requested\n", "ldbm_back_modrdn: new parent \"%s\" requested\n",
...@@ -314,7 +314,7 @@ ldbm_back_modrdn( ...@@ -314,7 +314,7 @@ ldbm_back_modrdn(
} }
} }
if ( newSuperior != NULL ) { if ( newSuperior && newSuperior->bv_val != NULL ) {
/* newSuperior == entry being moved?, if so ==> ERROR */ /* newSuperior == entry being moved?, if so ==> ERROR */
/* Get Entry with dn=newSuperior. Does newSuperior exist? */ /* Get Entry with dn=newSuperior. Does newSuperior exist? */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment