Return unwillingToPerform instead of noSuchObject for subschema subentry

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 31eed448a9362b703c0ad8385302583004c9e4e4..238c8f1d0b7068aaa17e0ea80b1eb6e816ba8572 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -186,8 +186,18 @@ do_add( Connection *conn, Operation *op )
        if( e->e_ndn == NULL || *e->e_ndn == '\0' ) {
                /* protocolError may be a more appropriate error */
                send_ldap_result( conn, op, rc = LDAP_ALREADY_EXISTS,
-                       NULL, "root DSE exists", NULL, NULL );
+                       NULL, "root DSE already exists",
+                       NULL, NULL );
                goto done;
+
+#if defined( SLAPD_SCHEMA_DN )
+       } else if ( strcasecmp( ndn, SLAPD_SCHEMA_DN ) == 0 ) {
+               /* protocolError may be a more appropriate error */
+               send_ldap_result( conn, op, rc = LDAP_ALREADY_EXISTS,
+                       NULL, "subschema subentry already exists",
+                       NULL, NULL );
+               goto done;
+#endif
        }
 
        manageDSAit = get_manageDSAit( op );

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index b1bf15eb8a0ff95e982da15a14b7214e579cecd7..89ca8964dc4e39d58ef30e345beb1494aed355b0 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -88,8 +88,8 @@ do_delete(
 
        if( *ndn == '\0' ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                          "do_delete: conn %d  Attempt to delete root DSE.\n", conn->c_connid ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_delete: conn %d: "
+                       "Attempt to delete root DSE.\n", conn->c_connid ));
 #else
                Debug( LDAP_DEBUG_ANY, "do_delete: root dse!\n", 0, 0, 0 );
 #endif
@@ -97,6 +97,21 @@ do_delete(
                send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
                        NULL, "cannot delete 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_INFO, "do_delete: conn %d: "
+                       "Attempt to delete subschema subentry.\n", conn->c_connid ));
+#else
+               Debug( LDAP_DEBUG_ANY, "do_delete: subschema subentry!\n", 0, 0, 0 );
+#endif
+               /* protocolError would likely be a more appropriate error */
+               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+                       NULL, "cannot delete the root DSE", NULL, NULL );
+               goto cleanup;
+
+#endif
        }
 
        Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d DEL dn=\"%s\"\n",

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index a00e54dc674491d6e5d75ef7ac8027f64274458a..2089bff88341b9d8b76dfd5964e3547a11b8a072 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -200,6 +200,21 @@ do_modify(
                send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
                        NULL, "modify upon the root DSE not supported", NULL, NULL );
                goto cleanup;
+
+#if defined( SLAPD_SCHEMA_DN )
+       } else if ( strcasecmp( ndn, SLAPD_SCHEMA_DN ) == 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                       "do_modify: attempt to modify subschema subentry.\n" ));
+#else
+               Debug( LDAP_DEBUG_ANY, "do_modify: subschema subentry!\n", 0, 0, 0 );
+#endif
+
+               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+                       NULL, "modification of subschema subentry not supported",
+                       NULL, NULL );
+               goto cleanup;
+#endif
        }
 
 #ifdef LDAP_DEBUG

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index a1d0d25b3cdc8532c565ae26a4d3ea551c9843d0..9e4422d7e74533490c135b902366666bdbf8ded0 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -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",