upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-06 23:19:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#7074 - change olcDatabaseDummy initialization for windows

Browse source
This commit is contained in:
Emily Backes 2015-02-05 18:46:24 -08:00 committed by Quanah Gibson-Mount
parent 4f7ea78c95
commit f4bfb5e0a5
3 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
servers/slapd/back-ldap/chain.c
View file

@ -1282,7 +1282,7 @@ static ConfigOCs chainocs[] = {
"NAME 'olcChainDatabase' "
"DESC 'Chain remote server configuration' "
"AUXILIARY )",
Cft_Misc, olcDatabaseDummy, chain_ldadd
Cft_Misc, NULL, chain_ldadd
#ifdef SLAP_CONFIG_DELETE
, NULL, chain_lddel
#endif
@ -2318,6 +2318,12 @@ chain_initialize( void )
/* Make sure we don't exceed the bits reserved for userland */
config_check_userland( CH_LAST );
/* olcDatabaseDummy is defined in slapd, and Windows
will not let us initialize a struct element with a data pointer
from another library, so we have to initialize this element
"by hand". */
chainocs[1].co_table = olcDatabaseDummy;
#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
rc = register_supported_control( LDAP_CONTROL_X_CHAINING_BEHAVIOR,
/* SLAP_CTRL_GLOBAL| */ SLAP_CTRL_ACCESS|SLAP_CTRL_HIDE, NULL,

10
servers/slapd/overlays/pcache.c
View file

@ -3752,7 +3752,8 @@ static ConfigOCs pcocs[] = {
{ "( OLcfgOvOc:2.2 "
"NAME 'olcPcacheDatabase' "
"DESC 'Cache database configuration' "
"AUXILIARY )", Cft_Misc, olcDatabaseDummy, pc_ldadd },
/* co_table is initialized in pcache_initialize */
"AUXILIARY )", Cft_Misc, NULL, pc_ldadd },
{ NULL, 0, NULL }
};
@ -5669,6 +5670,13 @@ pcache_initialize()
ConfigArgs c;
char *argv[ 4 ];
/* olcDatabaseDummy is defined in slapd, and Windows
will not let us initialize a struct element with a data pointer
from another library, so we have to initialize this element
"by hand". */
pcocs[1].co_table = olcDatabaseDummy;
code = slap_loglevel_get( &debugbv, &pcache_debug );
if ( code ) {
return code;

9
servers/slapd/overlays/translucent.c
View file

@ -113,7 +113,8 @@ static ConfigOCs translucentocs[] = {
{ "( OLcfgOvOc:14.2 "
"NAME 'olcTranslucentDatabase' "
"DESC 'Translucent target database configuration' "
"AUXILIARY )", Cft_Misc, olcDatabaseDummy, translucent_ldadd },
/* co_table is initialized in translucent_initialize() */
"AUXILIARY )", Cft_Misc, NULL, translucent_ldadd },
{ NULL, 0, NULL }
};
/* for translucent_init() */
@ -1388,6 +1389,12 @@ int translucent_initialize() {
int rc;
/* olcDatabaseDummy is defined in slapd, and Windows
will not let us initialize a struct element with a data pointer
from another library, so we have to initialize this element
"by hand". */
translucentocs[1].co_table = olcDatabaseDummy;
Debug(LDAP_DEBUG_TRACE, "==> translucent_initialize\n" );
translucent.on_bi.bi_type = "translucent";