mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#6363 cleanup prev commit

Browse Source
This commit is contained in:
Howard Chu 2009-11-15 21:36:23 +00:00
parent 545eb44fd5
commit 4cabc24269
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/slapd/bconfig.c
View File

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

1
servers/slapd/config.c
View File

@ -414,6 +414,7 @@ config_del_vals(ConfigTable *cf, ConfigArgs *c)
/* If there is no handler, just ignore it */ /* If there is no handler, just ignore it */
if ( cf->arg_type & ARG_MAGIC ) { if ( cf->arg_type & ARG_MAGIC ) {
c->argv[0] = cf->ad->ad_cname.bv_val;
c->op = LDAP_MOD_DELETE; c->op = LDAP_MOD_DELETE;
c->type = cf->arg_type & ARGS_USERLAND; c->type = cf->arg_type & ARGS_USERLAND;
rc = (*((ConfigDriver*)cf->arg_item))(c); rc = (*((ConfigDriver*)cf->arg_item))(c);