import fix to ITS#4860

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 16e1656553973f1b9d4caa3461d81ec2d0bb6d17..674084663a686d9542ee830afc87366d883ea17a 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-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -314,7 +314,7 @@ fe_op_add( Operation *op, SlapReply *rs )
                                }
 
 
-                               /* check for duplicate values */
+                               /* check for unmodifiable attributes */
                                rs->sr_err = slap_mods_no_repl_user_mod_check( op,
                                        modlist, &rs->sr_text, textbuf, textlen );
                                if ( rs->sr_err != LDAP_SUCCESS ) {
@@ -322,12 +322,14 @@ fe_op_add( Operation *op, SlapReply *rs )
                                        goto done;
                                }
 
+#if 0                  /* This is a no-op since *modtail is NULL */
                                rs->sr_err = slap_mods2entry( *modtail, &op->ora_e,
                                        0, 0, &rs->sr_text, textbuf, textlen );
                                if ( rs->sr_err != LDAP_SUCCESS ) {
                                        send_ldap_result( op, rs );
                                        goto done;
                                }
+#endif
                        }
 
 #ifdef SLAPD_MULTIMASTER
@@ -436,7 +438,7 @@ slap_mods2entry(
                        attr->a_vals = ch_realloc( attr->a_vals,
                                sizeof( struct berval ) * (i+j) );
 
-                       /* should check for duplicates */
+                       /* checked for duplicates in slap_mods_check */
 
                        if ( dup ) {
                                for ( j = 0; mods->sml_values[j].bv_val; j++ ) {
@@ -475,6 +477,7 @@ slap_mods2entry(
 #endif
                }
 
+#if 0  /* checked for duplicates in slap_mods_check */
                if( mods->sml_values[1].bv_val != NULL ) {
                        /* check for duplicates */
                        int             i, j, rc, match;
@@ -510,6 +513,7 @@ slap_mods2entry(
                                }
                        }
                }
+#endif
 
                attr = ch_calloc( 1, sizeof(Attribute) );
 
@@ -517,7 +521,6 @@ slap_mods2entry(
                attr->a_desc = mods->sml_desc;
 
                /* move values to attr structure */
-               /*      should check for duplicates */
                if ( dup ) { 
                        int i;
                        for ( i = 0; mods->sml_values[i].bv_val; i++ ) /* EMPTY */;
@@ -656,13 +659,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;
                }
@@ -715,9 +728,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 );
                }