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 de88b57f869983f373fd46b37ade7f8f591f8eac..c0c5a920a13005feeeefe8099946d952bea6edc9 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -44,6 +44,7 @@ do_add( Connection *conn, Operation *op )
        Modifications *mods = NULL;
        const char *text;
        int                     rc = LDAP_SUCCESS;
+       int     manageDSAit;
 
        Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
 
@@ -142,12 +143,22 @@ 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 );
@@ -230,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;
                        }