Experiment with busy loop protection...

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index f20a62c4f0b3c6c15be3d35aad2cc059b4269e9b..238c8f1d0b7068aaa17e0ea80b1eb6e816ba8572 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -47,8 +47,8 @@ do_add( Connection *conn, Operation *op )
        int     manageDSAit;
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-                   "do_add: conn %d enter\n", conn->c_connid ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "do_add: conn %d enter\n", conn->c_connid ));
 #else
        Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
 #endif
@@ -67,8 +67,8 @@ do_add( Connection *conn, Operation *op )
        /* get the name */
        if ( ber_scanf( ber, "{a", /*}*/ &dn ) == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "do_add: conn %d ber_scanf failed\n", conn->c_connid ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "do_add: conn %d ber_scanf failed\n", conn->c_connid ));
 #else
                Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
 #endif
@@ -81,8 +81,8 @@ do_add( Connection *conn, Operation *op )
 
        if ( dn_normalize( ndn ) == NULL ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "do_add: conn %d  invalid dn (%s)\n", conn->c_connid, dn ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "do_add: conn %d      invalid dn (%s)\n", conn->c_connid, dn ));
 #else
                Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn, 0, 0 );
 #endif
@@ -101,8 +101,8 @@ do_add( Connection *conn, Operation *op )
        e->e_private = NULL;
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-                   "do_add: conn %d  ndn (%s)\n", conn->c_connid, e->e_ndn ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+                  "do_add: conn %d  ndn (%s)\n", conn->c_connid, e->e_ndn ));
 #else
        Debug( LDAP_DEBUG_ARGS, "do_add: ndn (%s)\n", e->e_ndn, 0, 0 );
 #endif
@@ -119,8 +119,8 @@ do_add( Connection *conn, Operation *op )
 
                if ( rc == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                               "do_add: conn %d  decoding error \n", conn->c_connid ));
+                       LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                                  "do_add: conn %d      decoding error \n", conn->c_connid ));
 #else
                        Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
 #endif
@@ -133,9 +133,9 @@ do_add( Connection *conn, Operation *op )
 
                if ( mod->ml_bvalues == NULL ) {
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                               "do_add: conn %d  no values for type %s\n",
-                               conn->c_connid, mod->ml_type ));
+                       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                                  "do_add: conn %d      no values for type %s\n",
+                                  conn->c_connid, mod->ml_type ));
 #else
                        Debug( LDAP_DEBUG_ANY, "no values for type %s\n",
                                mod->ml_type, 0, 0 );
@@ -153,8 +153,8 @@ do_add( Connection *conn, Operation *op )
 
        if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "do_add: conn %d  ber_scanf failed\n", conn->c_connid ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "do_add: conn %d      ber_scanf failed\n", conn->c_connid ));
 #else
                Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
 #endif
@@ -166,8 +166,8 @@ do_add( Connection *conn, Operation *op )
 
        if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                       "do_add: conn %d  get_ctrls failed\n", conn->c_connid ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "do_add: conn %d      get_ctrls failed\n", conn->c_connid ));
 #else
                Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
 #endif
@@ -186,12 +186,21 @@ 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 ) &&
-               is_entry_referral( e );
+       manageDSAit = get_manageDSAit( op );
 
        /*
         * We could be serving multiple database backends.  Select the
@@ -234,8 +243,12 @@ do_add( Connection *conn, Operation *op )
 #endif
                {
                        int update = be->be_update_ndn != NULL;
+                       char textbuf[SLAP_TEXT_BUFLEN];
+                       size_t textlen = sizeof textbuf;
+
+                       rc = slap_modlist2mods( modlist, update, &mods, &text,
+                               textbuf, textlen );
 
-                       rc = slap_modlist2mods( modlist, update, &mods, &text );
                        if( rc != LDAP_SUCCESS ) {
                                send_ldap_result( conn, op, rc,
                                        NULL, text, NULL, NULL );
@@ -287,13 +300,13 @@ do_add( Connection *conn, Operation *op )
                }
        } else {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                       "do_add: conn %d  no backend support\n", conn->c_connid ));
+           LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                      "do_add: conn %d  no backend support\n", conn->c_connid ));
 #else
-           Debug( LDAP_DEBUG_ARGS, "    do_add: no backend support\n", 0, 0, 0 );
+           Debug( LDAP_DEBUG_ARGS, "    do_add: no backend support\n", 0, 0, 0 );
 #endif
-            send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-                              NULL, "operation not supported within namingContext", NULL, NULL );
+           send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+                             NULL, "operation not supported within namingContext", NULL, NULL );
        }
 
 done: