upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9576 Put the used table in ConfigArgs

Browse source
This commit is contained in:
Ondřej Kuzník 2021-06-08 09:52:43 +01:00 committed by Quanah Gibson-Mount
parent 3138c8d5db
commit b4afe00942
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
servers/lloadd/config.c
View file

@ -2121,7 +2121,8 @@ lload_config_find_keyword( ConfigTable *Conf, ConfigArgs *c )
} }
c->line = c->tline; c->line = c->tline;
} }
return Conf + i; c->ca_desc = Conf + i;
return c->ca_desc;
} }
int int

1
servers/slapd/bconfig.c
View file

@ -4822,6 +4822,7 @@ config_find_table( ConfigOCs **colst, int nocs, AttributeDescription *ad,
for (i=0; colst[j]->co_table[i].name; i++) for (i=0; colst[j]->co_table[i].name; i++)
if ( colst[j]->co_table[i].ad == ad ) { if ( colst[j]->co_table[i].ad == ad ) {
ca->table = colst[j]->co_type; ca->table = colst[j]->co_type;
ca->ca_desc = colst[j]->co_table+i;
return &colst[j]->co_table[i]; return &colst[j]->co_table[i];
} }
} }

3
servers/slapd/config.c
View file

@ -143,7 +143,8 @@ ConfigTable *config_find_keyword(ConfigTable *Conf, ConfigArgs *c) {
} }
c->line = c->tline; c->line = c->tline;
} }
return Conf+i; c->ca_desc = Conf+i;
return c->ca_desc;
} }
int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) { int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {

3
servers/slapd/slap-config.h
View file

@ -176,7 +176,8 @@ typedef struct config_args_s {
#define SLAP_CONFIG_CLEANUP_MAX 16 #define SLAP_CONFIG_CLEANUP_MAX 16
#endif #endif
ConfigDriver *cleanups[SLAP_CONFIG_CLEANUP_MAX]; ConfigDriver *cleanups[SLAP_CONFIG_CLEANUP_MAX];
ConfigType table; /* which config table did we come from */ ConfigType table; /* what kind of config table did we come from */
ConfigTable *ca_desc;
int num_cleanups; int num_cleanups;
} ConfigArgs; } ConfigArgs;