add new ber dump routine (behind NEW_LOGGING)

[openldap] / servers / slapd / modrdn.c

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index e5acfd1f832949e9274bb418f78d203d5008305a..7bcf98ecf63bf35daa8d821dc38252ffeeba6475 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -54,6 +54,7 @@ do_modrdn(
        ber_len_t       length;
        int rc;
        const char *text;
+       int manageDSAit;
 
        Debug( LDAP_DEBUG_TRACE, "do_modrdn\n", 0, 0, 0 );
 
@@ -150,16 +151,24 @@ do_modrdn(
                goto cleanup;
        }
 
+       if( ndn == '\0' ) {
+               Debug( LDAP_DEBUG_ANY, "do_modrdn: root dse!\n", 0, 0, 0 );
+               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+                       NULL, "cannot rename the root DSE", NULL, NULL );
+               goto cleanup;
+       }
+
        Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d MODRDN dn=\"%s\"\n",
            op->o_connid, op->o_opid, dn, 0, 0 );
 
+       manageDSAit = get_manageDSAit( op );
+
        /*
         * We could be serving multiple database backends.  Select the
         * appropriate one, or send a referral to our "referral server"
         * if we don't hold it.
         */
-
-       if ( (be = select_backend( ndn )) == NULL ) {
+       if ( (be = select_backend( ndn, manageDSAit )) == NULL ) {
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
                        NULL, NULL, default_referral, NULL );
                goto cleanup;
@@ -183,7 +192,7 @@ do_modrdn(
         * the same backend, otherwise we return an error.
         */
        if( newSuperior != NULL ) {
-               newSuperior_be = select_backend( nnewSuperior );
+               newSuperior_be = select_backend( nnewSuperior, 0 );
 
                if ( newSuperior_be != be ) {
                        /* newSuperior is in same backend */