allow array of more generic syntaxes

[openldap] / servers / slapd / modify.c

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index ca53e0b9fa0e19284e31371351135341821a21f9..5b46c1a09fee04fbb1b6ef68ceb91146cebf1bb7 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -41,9 +41,6 @@ do_modify(
     SlapReply  *rs )
 {
        struct berval dn = BER_BVNULL;
-       char            *last;
-       ber_tag_t       tag;
-       ber_len_t       len;
        char            textbuf[ SLAP_TEXT_BUFLEN ];
        size_t          textlen = sizeof( textbuf );
 
@@ -287,7 +284,6 @@ fe_op_modify( Operation *op, SlapReply *rs )
                 */
                if ( !SLAP_SINGLE_SHADOW(op->o_bd) || repl_user ) {
                        int update = !BER_BVISEMPTY( &op->o_bd->be_update_ndn );
-                       slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
 
                        op->o_bd = op_be;
 
@@ -299,13 +295,6 @@ fe_op_modify( Operation *op, SlapReply *rs )
                                        goto cleanup;
                                }
                        }
-
-                       if ( !repl_user ) {
-                               /* but multimaster slapd logs only the ones 
-                                * not from a replicator user */
-                               cb.sc_next = op->o_callback;
-                               op->o_callback = &cb;
-                       }
                        op->o_bd->be_modify( op, rs );
 
                } else { /* send a referral */
@@ -695,7 +684,7 @@ int slap_mods_check(
 
                                        MatchingRule *mr = ad->ad_type->sat_equality;
                                        int istack[sizeof(int)*16];
-                                       int i,j,k,l,ir,jstack, rc, match, *ix, itmp;
+                                       int i, j, k, l, ir, jstack, match, *ix, itmp;
                                        struct berval a, *cv;
 
 /* If PRESERVE_ORDER is defined only the index array is sorted; the
@@ -924,11 +913,9 @@ void slap_mods_opattrs(
 
                ptr = ber_bvchr( &csn, '#' );
                if ( ptr ) {
-                       timestamp.bv_len = ptr - csn.bv_val;
-                       if ( timestamp.bv_len >= sizeof( timebuf ) ) {  /* ?!? */
-                               timestamp.bv_len = sizeof( timebuf ) - 1;
-                       }
+                       timestamp.bv_len = STRLENOF("YYYYMMDDHHMMSSZ");
                        AC_MEMCPY( timebuf, csn.bv_val, timestamp.bv_len );
+                       timebuf[timestamp.bv_len-1] = 'Z';
                        timebuf[timestamp.bv_len] = '\0';
 
                } else {