+ Fixed slapd connectionless LDAP support

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 896eae65ea9d97b4708197b67ee30a8d869a0146..acf2e2f85ecb4b4cb56ce7521eaed42d00bfa39c 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -217,7 +217,7 @@ fe_op_add( Operation *op, SlapReply *rs )
        Modifications   *modlist = op->ora_modlist;
        Modifications   **modtail = &modlist;
        int             rc = 0;
-       BackendDB *op_be;
+       BackendDB *op_be, *bd = op->o_bd;
        char            textbuf[ SLAP_TEXT_BUFLEN ];
        size_t          textlen = sizeof( textbuf );
 
@@ -230,14 +230,13 @@ fe_op_add( Operation *op, SlapReply *rs )
         */
        op->o_bd = select_backend( &op->ora_e->e_nname, manageDSAit, 1 );
        if ( op->o_bd == NULL ) {
+               op->o_bd = bd;
                rs->sr_ref = referral_rewrite( default_referral,
                        NULL, &op->ora_e->e_name, LDAP_SCOPE_DEFAULT );
                if ( !rs->sr_ref ) rs->sr_ref = default_referral;
                if ( rs->sr_ref ) {
                        rs->sr_err = LDAP_REFERRAL;
-                       op->o_bd = frontendDB;
                        send_ldap_result( op, rs );
-                       op->o_bd = NULL;
 
                        if ( rs->sr_ref != default_referral ) {
                                ber_bvarray_free( rs->sr_ref );
@@ -379,6 +378,7 @@ fe_op_add( Operation *op, SlapReply *rs )
        }
 
 done:;
+       op->o_bd = bd;
        return rc;
 }
 
@@ -470,6 +470,7 @@ slap_mods2entry(
                        snprintf( textbuf, textlen,
                                "attribute '%s' provided more than once",
                                mods->sml_desc->ad_cname.bv_val );
+                       *text = textbuf;
                        return LDAP_TYPE_OR_VALUE_EXISTS;
 #endif
                }
@@ -500,6 +501,7 @@ slap_mods2entry(
                                                snprintf( textbuf, textlen,
                                                        "%s: value #%d provided more than once",
                                                        mods->sml_desc->ad_cname.bv_val, j );
+                                               *text = textbuf;
                                                return LDAP_TYPE_OR_VALUE_EXISTS;
 
                                        } else if ( rc != LDAP_SUCCESS ) {
@@ -654,13 +656,23 @@ int slap_add_opattrs(
 
        if ( SLAP_LASTMOD( op->o_bd ) ) {
                char *ptr;
+               int gotcsn = 0;
                timestamp.bv_val = timebuf;
+
+               a = attr_find( op->ora_e->e_attrs, slap_schema.si_ad_entryCSN );
+               if ( a ) {
+                       gotcsn = 1;
+                       csn = a->a_vals[0];
+               }
                if ( BER_BVISEMPTY( &op->o_csn )) {
-                       if ( SLAP_SHADOW( op->o_bd ))
-                               manage_ctxcsn = 0;
-                       csn.bv_val = csnbuf;
-                       csn.bv_len = sizeof(csnbuf);
-                       slap_get_csn( op, &csn, manage_ctxcsn );
+                       if ( !gotcsn ) {
+                               csn.bv_val = csnbuf;
+                               csn.bv_len = sizeof(csnbuf);
+                               slap_get_csn( op, &csn, manage_ctxcsn );
+                       } else {
+                               if ( manage_ctxcsn )
+                                       slap_queue_csn( op, &csn );
+                       }
                } else {
                        csn = op->o_csn;
                }
@@ -713,9 +725,7 @@ int slap_add_opattrs(
                                slap_schema.si_ad_createTimestamp, &timestamp, NULL );
                }
 
-               a = attr_find( op->ora_e->e_attrs,
-                       slap_schema.si_ad_entryCSN );
-               if ( !a ) {
+               if ( !gotcsn ) {
                        attr_merge_one( op->ora_e,
                                slap_schema.si_ad_entryCSN, &csn, NULL );
                }