X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodrdn.c;h=372f0a33e8a15b19a581a1486cd52731edbd1ba4;hb=956f1d16aa522da6f6506d9c8fe9ce0d9867678a;hp=8bf032189e818de2f8467d55cfefbe7cf8589c8f;hpb=d4bc79864d1ff40f529a5dbe9087e116310c780b;p=openldap

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 8bf032189e..372f0a33e8 100644
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -201,7 +201,6 @@ do_modrdn(
 			NULL, "cannot rename the root DSE", NULL, NULL );
 		goto cleanup;
 
-#ifdef SLAPD_SCHEMA_DN
 	} else if ( bvmatch( &ndn, &global_schemandn ) ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, ERR,
@@ -215,7 +214,6 @@ do_modrdn(
 		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
 			NULL, "cannot rename subschema subentry", NULL, NULL );
 		goto cleanup;
-#endif
 	}
 
 	/* FIXME: should have/use rdnPretty / rdnNormalize routines */
@@ -401,6 +399,9 @@ slap_modrdn2mods(
 	Modifications	*mod = NULL;
 	int		a_cnt, d_cnt;
 
+	assert( new_rdn != NULL );
+	assert( !deleteoldrdn || old_rdn != NULL );
+
 	/* Add new attribute values to the entry */
 	for ( a_cnt = 0; new_rdn[ 0 ][ a_cnt ]; a_cnt++ ) {
 		AttributeDescription	*desc = NULL;