Minor changes to support parallel make.

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 1c897d91f89c2c23754810d45c7bf4cd4bf8811f..efb4e18d6d9b04a676c2534e87735f656d82e86a 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -26,7 +26,7 @@ int
 do_add( Connection *conn, Operation *op )
 {
        BerElement      *ber = op->o_ber;
-       char            *dn, *last;
+       char            *dn, *ndn, *last;
        ber_len_t       len;
        ber_tag_t       tag;
        Entry           *e;
@@ -35,6 +35,13 @@ do_add( Connection *conn, Operation *op )
 
        Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
 
+       if( op->o_bind_in_progress ) {
+               Debug( LDAP_DEBUG_ANY, "do_add: SASL bind in progress.\n", 0, 0, 0 );
+               send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, NULL,
+                   "SASL bind in progress", NULL, NULL );
+               return LDAP_SASL_BIND_IN_PROGRESS;
+       }
+
        /*
         * Parse the add request.  It looks like this:
         *
@@ -50,15 +57,26 @@ do_add( Connection *conn, Operation *op )
        /* get the name */
        if ( ber_scanf( ber, "{a", /*}*/ &dn ) == LBER_ERROR ) {
                Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
-               send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
-                   "decoding error" );
-               return LDAP_PROTOCOL_ERROR;
+               send_ldap_disconnect( conn, op,
+                       LDAP_PROTOCOL_ERROR, "decoding error" );
+               return -1;
+       }
+
+       ndn = ch_strdup( dn );
+
+       if ( dn_normalize_case( ndn ) == NULL ) {
+               Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn, 0, 0 );
+               send_ldap_result( conn, op, LDAP_INVALID_DN_SYNTAX, NULL,
+                   "invalid DN", NULL, NULL );
+               free( dn );
+               free( ndn );
+               return LDAP_INVALID_DN_SYNTAX;
        }
 
        e = (Entry *) ch_calloc( 1, sizeof(Entry) );
 
        e->e_dn = dn;
-       e->e_ndn = dn_normalize_case( ch_strdup( dn ) );
+       e->e_ndn = ndn;
        e->e_private = NULL;
 
        dn = NULL;
@@ -73,17 +91,17 @@ do_add( Connection *conn, Operation *op )
                struct berval   **vals;
 
                if ( ber_scanf( ber, "{a{V}}", &type, &vals ) == LBER_ERROR ) {
-                       send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR,
-                           NULL, "decoding error" );
+                       send_ldap_disconnect( conn, op,
+                               LDAP_PROTOCOL_ERROR, "decoding error" );
                        entry_free( e );
-                       return LDAP_PROTOCOL_ERROR;
+                       return -1;
                }
 
                if ( vals == NULL ) {
                        Debug( LDAP_DEBUG_ANY, "no values for type %s\n", type,
                            0, 0 );
-                       send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
-                           NULL );
+                       send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR,
+                               NULL, "no values for type", NULL, NULL );
                        free( type );
                        entry_free( e );
                        return LDAP_PROTOCOL_ERROR;
@@ -98,21 +116,19 @@ do_add( Connection *conn, Operation *op )
        if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
                entry_free( e );
                Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
-               send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
-                   "decoding error" );
-               return LDAP_PROTOCOL_ERROR;
+               send_ldap_disconnect( conn, op,
+                       LDAP_PROTOCOL_ERROR, "decoding error" );
+               return -1;
        }
 
-#ifdef GET_CTRLS
        if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
                entry_free( e );
                Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
                return rc;
        } 
-#endif
 
        Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d ADD dn=\"%s\"\n",
-           conn->c_connid, op->o_opid, e->e_ndn, 0, 0 );
+           op->o_connid, op->o_opid, e->e_ndn, 0, 0 );
 
        /*
         * We could be serving multiple database backends.  Select the
@@ -122,8 +138,8 @@ do_add( Connection *conn, Operation *op )
        be = select_backend( e->e_ndn );
        if ( be == NULL ) {
                entry_free( e );
-               send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL,
-                   default_referral );
+               send_ldap_result( conn, op, LDAP_REFERRAL, NULL,
+                   NULL, default_referral, NULL );
                return rc;
        }
 
@@ -150,14 +166,14 @@ do_add( Connection *conn, Operation *op )
 
                } else {
                        entry_free( e );
-                       send_ldap_result( conn, op, rc = LDAP_PARTIAL_RESULTS, NULL,
-                           default_referral );
+                       send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
+                               be->be_update_refs ? be->be_update_refs : default_referral, NULL );
                }
        } else {
            Debug( LDAP_DEBUG_ARGS, "    do_add: HHH\n", 0, 0, 0 );
                entry_free( e );
-               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "Function not implemented" );
+               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+                       NULL, "Function not implemented", NULL, NULL );
        }
 
        return rc;
@@ -181,7 +197,7 @@ add_created_attrs( Operation *op, Entry *e )
 
        /* remove any attempts by the user to add these attrs */
        for ( a = &e->e_attrs; *a != NULL; a = next ) {
-               if ( oc_check_operational( (*a)->a_type ) ) {
+               if ( oc_check_no_usermod_attr( (*a)->a_type ) ) {
                        tmp = *a;
                        *a = (*a)->a_next;
                        attr_free( tmp );
@@ -192,7 +208,7 @@ add_created_attrs( Operation *op, Entry *e )
        }
 
        if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
-               bv.bv_val = "NULLDN";
+               bv.bv_val = "<anonymous>";
                bv.bv_len = strlen( bv.bv_val );
        } else {
                bv.bv_val = op->o_dn;