ITS#6363 cleanup prev commit

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 77cff39ea577a47df7885ec76203042ef97e3f36..552efce75dbca7a97c2fae32fe459dd7d5b4c6a5 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -4600,7 +4600,6 @@ schema_destroy_one( ConfigArgs *ca, ConfigOCs **colst, int nocs,
                ad = NULL;
                slap_bv2ad( &bv, &ad, &text );
                ct = config_find_table( colst, nocs, ad, ca );
-               ca->argv[0] = ct->ad->ad_cname.bv_val;
                config_del_vals( ct, ca );
        }
        if ( cfn->c_oc_head ) {
@@ -4608,7 +4607,6 @@ schema_destroy_one( ConfigArgs *ca, ConfigOCs **colst, int nocs,
                ad = NULL;
                slap_bv2ad( &bv, &ad, &text );
                ct = config_find_table( colst, nocs, ad, ca );
-               ca->argv[0] = ct->ad->ad_cname.bv_val;
                config_del_vals( ct, ca );
        }
        if ( cfn->c_at_head ) {
@@ -4616,7 +4614,6 @@ schema_destroy_one( ConfigArgs *ca, ConfigOCs **colst, int nocs,
                ad = NULL;
                slap_bv2ad( &bv, &ad, &text );
                ct = config_find_table( colst, nocs, ad, ca );
-               ca->argv[0] = ct->ad->ad_cname.bv_val;
                config_del_vals( ct, ca );
        }
        if ( cfn->c_syn_head ) {
@@ -4624,7 +4621,6 @@ schema_destroy_one( ConfigArgs *ca, ConfigOCs **colst, int nocs,
                ad = NULL;
                slap_bv2ad( &bv, &ad, &text );
                ct = config_find_table( colst, nocs, ad, ca );
-               ca->argv[0] = ct->ad->ad_cname.bv_val;
                config_del_vals( ct, ca );
        }
        if ( cfn->c_om_head ) {
@@ -4632,7 +4628,6 @@ schema_destroy_one( ConfigArgs *ca, ConfigOCs **colst, int nocs,
                ad = NULL;
                slap_bv2ad( &bv, &ad, &text );
                ct = config_find_table( colst, nocs, ad, ca );
-               ca->argv[0] = ct->ad->ad_cname.bv_val;
                config_del_vals( ct, ca );
        }
        cfo = p->ce_private;
@@ -5428,7 +5423,6 @@ config_modify_internal( CfEntryInfo *ce, Operation *op, SlapReply *rs,
                                ca->valx = -1;
                                ca->line = NULL;
                                ca->argc = 1;
-                               ca->argv[0] = ct->ad->ad_cname.bv_val;
                                rc = config_del_vals( ct, ca );
                                if ( rc ) rc = LDAP_OTHER;
                                if ( s )
@@ -5476,7 +5470,6 @@ out:
                                        ca->valx = -1;
                                        ca->line = NULL;
                                        ca->argc = 1;
-                                       ca->argv[0] = ct->ad->ad_cname.bv_val;
                                        config_del_vals( ct, ca );
                                }
                                for ( i=0; !BER_BVISNULL( &s->a_vals[i] ); i++ ) {
@@ -5492,7 +5485,6 @@ out:
                                ca->valx = -1;
                                ca->line = NULL;
                                ca->argc = 1;
-                               ca->argv[0] = ct->ad->ad_cname.bv_val;
                                config_del_vals( ct, ca );
                                s = attr_find( save_attrs, a->a_desc );
                                if ( s ) {

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index c491d17c168ab6fcf43cddd1c6fec838ab52ee63..b40873cb658e68f8e9811eedc191bd2d52a4d8e2 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -414,6 +414,7 @@ config_del_vals(ConfigTable *cf, ConfigArgs *c)
 
        /* If there is no handler, just ignore it */
        if ( cf->arg_type & ARG_MAGIC ) {
+               c->argv[0] = cf->ad->ad_cname.bv_val;
                c->op = LDAP_MOD_DELETE;
                c->type = cf->arg_type & ARGS_USERLAND;
                rc = (*((ConfigDriver*)cf->arg_item))(c);