From 574769395a24fdac947b175659e03a1d80a57b10 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 23 Nov 2006 11:07:03 +0000 Subject: [PATCH] ITS#4600 #if out redundant checks. will delete them later. --- servers/slapd/add.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/servers/slapd/add.c b/servers/slapd/add.c index e00f6d1a40..d39af385a2 100644 --- a/servers/slapd/add.c +++ b/servers/slapd/add.c @@ -315,7 +315,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, op->ora_modlist, &rs->sr_text, textbuf, textlen ); if ( rs->sr_err != LDAP_SUCCESS ) { @@ -323,12 +323,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 cb.sc_next = op->o_callback; op->o_callback = &cb; @@ -431,7 +433,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++ ) { @@ -470,6 +472,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; @@ -505,11 +508,11 @@ slap_mods2entry( } } } +#endif attr = attr_alloc( 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 */; -- 2.39.5