add new ber dump routine (behind NEW_LOGGING)

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 3db0bf9d025af996c7e6a8bf04ab70cf98748a2b..c0c5a920a13005feeeefe8099946d952bea6edc9 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -44,7 +44,7 @@ do_add( Connection *conn, Operation *op )
        Modifications *mods = NULL;
        const char *text;
        int                     rc = LDAP_SUCCESS;
-       struct berval **urls = NULL;
+       int     manageDSAit;
 
        Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
 
@@ -143,20 +143,30 @@ do_add( Connection *conn, Operation *op )
        Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d ADD dn=\"%s\"\n",
            op->o_connid, op->o_opid, e->e_ndn, 0, 0 );
 
+       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 );
+               goto done;
+       }
+
+       manageDSAit = get_manageDSAit( op ) &&
+               is_entry_referral( e );
+
        /*
         * 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.
         */
-       be = select_backend( e->e_ndn );
+       be = select_backend( e->e_ndn, manageDSAit );
        if ( be == NULL ) {
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
                        NULL, NULL, default_referral, NULL );
                goto done;
        }
 
-       /* make sure this backend recongizes critical controls */
-       rc = backend_check_controls( be, conn, op, &text ) ;
+       /* check restrictions */
+       rc = backend_check_restrictions( be, conn, op, NULL, &text ) ;
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
                        NULL, text, NULL, NULL );
@@ -164,19 +174,8 @@ do_add( Connection *conn, Operation *op )
        }
 
        /* check for referrals */
-       rc = backend_check_referrals( be, conn, op, &urls, &text );
+       rc = backend_check_referrals( be, conn, op, e->e_dn, e->e_ndn );
        if ( rc != LDAP_SUCCESS ) {
-               send_ldap_result( conn, op, rc,
-                       NULL, text, urls, NULL );
-               ber_bvecfree( urls );
-               goto done;
-       }
-
-       if ( global_readonly || be->be_readonly ) {
-               Debug( LDAP_DEBUG_ANY, "do_add: database is read-only\n",
-                      0, 0, 0 );
-               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-                       NULL, "directory is read-only", NULL, NULL );
                goto done;
        }
 
@@ -242,7 +241,7 @@ do_add( Connection *conn, Operation *op )
                                {
                                        replog( be, op, e->e_dn, e );
                                }
-                               be_entry_release_w( be, e );
+                               be_entry_release_w( be, conn, op, e );
                                e = NULL;
                        }
 
@@ -289,8 +288,34 @@ static int slap_mods2entry(
                attr = attr_find( (*e)->e_attrs, mods->sml_desc );
 
                if( attr != NULL ) {
+#define SLURPD_FRIENDLY
+#ifdef SLURPD_FRIENDLY
+                       ber_len_t i,j;
+
+                       for( i=0; attr->a_vals[i]; i++ ) {
+                               /* count them */
+                       }
+                       for( j=0; mods->sml_bvalues[j]; j++ ) {
+                               /* count them */
+                       }
+                       j++;    /* NULL */
+                       
+                       attr->a_vals = ch_realloc( attr->a_vals,
+                               sizeof( struct berval * ) * (i+j) );
+
+                       /* should check for duplicates */
+                       AC_MEMCPY( &attr->a_vals[i], mods->sml_bvalues,
+                               sizeof( struct berval * ) * j );
+
+                       /* trim the mods array */
+                       ch_free( mods->sml_bvalues );
+                       mods->sml_bvalues = NULL;
+
+                       continue;
+#else
                        *text = "attribute provided more than once";
-                       return LDAP_OPERATIONS_ERROR;
+                       return LDAP_TYPE_OR_VALUE_EXISTS;
+#endif
                }
 
                attr = ch_calloc( 1, sizeof(Attribute) );