Fixup bdb_entry_release now that entry_decode uses two memory blocks

[openldap] / servers / slapd / modrdn.c

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 573ae8ee19302a5cef53a188be59c69aab6f3028..0ae0916fb95b188187e3587c730c79747e28e895 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -212,7 +212,7 @@ do_modrdn(
                goto cleanup;
        }
 
-       if( ndn == '\0' ) {
+       if( *ndn == '\0' ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
                           "do_modrdn:  attempt to modify root DSE.\n" ));
@@ -223,6 +223,20 @@ do_modrdn(
                send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
                        NULL, "cannot rename the root DSE", NULL, NULL );
                goto cleanup;
+
+#ifdef SLAPD_SCHEMA_DN
+       } else if ( strcasecmp( ndn, SLAPD_SCHEMA_DN ) == 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                       "do_modrdn: attempt to modify subschema subentry\n" ));
+#else
+               Debug( LDAP_DEBUG_ANY, "do_modrdn: subschema subentry!\n", 0, 0, 0 );
+#endif
+
+               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+                       NULL, "cannot rename subschema subentry", NULL, NULL );
+               goto cleanup;
+#endif
        }
 
        Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d MODRDN dn=\"%s\"\n",
@@ -236,8 +250,13 @@ do_modrdn(
         * if we don't hold it.
         */
        if ( (be = select_backend( ndn, manageDSAit )) == NULL ) {
+               struct berval **ref = referral_rewrite( default_referral,
+                       NULL, dn, LDAP_SCOPE_DEFAULT );
+
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-                       NULL, NULL, default_referral, NULL );
+                       NULL, NULL, ref ? ref : default_referral, NULL );
+
+               ber_bvecfree( ref );
                goto cleanup;
        }
 
@@ -287,15 +306,14 @@ do_modrdn(
        if ( be->be_modrdn ) {
                /* do the update here */
 #ifndef SLAPD_MULTIMASTER
-               if ( be->be_update_ndn == NULL ||
-                       strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
+               int repl_user = be_isupdate( be, op->o_ndn );
+               if ( be->be_update_ndn == NULL || repl_user )
 #endif
                {
                        if ( (*be->be_modrdn)( be, conn, op, dn, ndn, newrdn,
                            deloldrdn, newSuperior ) == 0
 #ifdef SLAPD_MULTIMASTER
-                               && ( be->be_update_ndn == NULL ||
-                                       strcmp( be->be_update_ndn, op->o_ndn ) )
+                               && ( be->be_update_ndn == NULL || !repl_user )
 #endif
                        ) {
                                struct replog_moddn moddn;
@@ -307,8 +325,15 @@ do_modrdn(
                        }
 #ifndef SLAPD_MULTIMASTER
                } else {
+                       struct berval **defref = be->be_update_refs
+                               ? be->be_update_refs : default_referral;
+                       struct berval **ref = referral_rewrite( defref,
+                               NULL, dn, LDAP_SCOPE_DEFAULT );
+
                        send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
-                               be->be_update_refs ? be->be_update_refs : default_referral, NULL );
+                               ref ? ref : defref, NULL );
+
+                       ber_bvecfree( ref );
 #endif
                }
        } else {