diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2008-10-23 22:42:55 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2008-10-23 22:42:55 +0000 |
| commit | 7572dfdc019f3e4b676d5a883d9fc0453dcde0e6 (patch) | |
| tree | c33069f9583d1cb113efcaed5db1b722d5f7df3e /ldap/servers/slapd | |
| parent | dc4d226a1a2f14d0f55e5e263ee5c1f989c7edab (diff) | |
| download | ds-7572dfdc019f3e4b676d5a883d9fc0453dcde0e6.tar.gz ds-7572dfdc019f3e4b676d5a883d9fc0453dcde0e6.tar.xz ds-7572dfdc019f3e4b676d5a883d9fc0453dcde0e6.zip | |
Resolves: #468248
Summary: LDAPI: when nsslapd-ldapiautodnsuffix doesn't exist - Bind is incorrect
Description:
- introducing --enable-auto-dn-suffix option to configure (disabled by default)
- building the auto-dn-suffix code only when the option is set
Diffstat (limited to 'ldap/servers/slapd')
| -rw-r--r-- | ldap/servers/slapd/daemon.c | 2 | ||||
| -rw-r--r-- | ldap/servers/slapd/libglobs.c | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c index cd1f6ecb..32c7688c 100644 --- a/ldap/servers/slapd/daemon.c +++ b/ldap/servers/slapd/daemon.c @@ -2172,6 +2172,7 @@ root_map_free: } } +#if defined(ENABLE_AUTO_DN_SUFFIX) if(ret) { /* create phony auth dn? */ @@ -2209,6 +2210,7 @@ root_map_free: ret = 0; } } +#endif } bail: diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c index 6a7c0178..dd2275b0 100644 --- a/ldap/servers/slapd/libglobs.c +++ b/ldap/servers/slapd/libglobs.c @@ -483,9 +483,11 @@ static struct config_get_and_set { {CONFIG_LDAPI_SEARCH_BASE_DN_ATTRIBUTE, config_set_ldapi_search_base_dn, NULL, 0, (void**)&global_slapdFrontendConfig.ldapi_search_base_dn, CONFIG_STRING, NULL}, +#if defined(ENABLE_AUTO_DN_SUFFIX) {CONFIG_LDAPI_AUTO_DN_SUFFIX_ATTRIBUTE, config_set_ldapi_auto_dn_suffix, NULL, 0, (void**)&global_slapdFrontendConfig.ldapi_auto_dn_suffix, CONFIG_STRING, NULL}, +#endif {CONFIG_ACCESSLOG_MINFREEDISKSPACE_ATTRIBUTE, NULL, log_set_mindiskspace, SLAPD_ACCESS_LOG, (void**)&global_slapdFrontendConfig.accesslog_minfreespace, CONFIG_INT, NULL}, @@ -831,7 +833,9 @@ FrontendConfig_init () { cfg->ldapi_uidnumber_type = slapi_ch_strdup("uidNumber"); cfg->ldapi_gidnumber_type = slapi_ch_strdup("gidNumber"); cfg->ldapi_search_base_dn = slapi_ch_strdup("dc=example, dc=com"); +#if defined(ENABLE_AUTO_DN_SUFFIX) cfg->ldapi_auto_dn_suffix = slapi_ch_strdup("cn=peercred,cn=external,cn=auth"); +#endif cfg->threadnumber = SLAPD_DEFAULT_MAX_THREADS; cfg->maxthreadsperconn = SLAPD_DEFAULT_MAX_THREADS_PER_CONN; cfg->reservedescriptors = SLAPD_DEFAULT_RESERVE_FDS; @@ -1373,6 +1377,7 @@ int config_set_ldapi_search_base_dn( const char *attrname, char *value, char *er return retVal; } +#if defined(ENABLE_AUTO_DN_SUFFIX) int config_set_ldapi_auto_dn_suffix( const char *attrname, char *value, char *errorbuf, int apply ) { int retVal = LDAP_SUCCESS; @@ -1391,6 +1396,7 @@ int config_set_ldapi_auto_dn_suffix( const char *attrname, char *value, char *er } return retVal; } +#endif int @@ -3420,6 +3426,7 @@ char *config_get_ldapi_search_base_dn(){ return retVal; } +#if defined(ENABLE_AUTO_DN_SUFFIX) char *config_get_ldapi_auto_dn_suffix(){ char *retVal; slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); @@ -3429,7 +3436,7 @@ char *config_get_ldapi_auto_dn_suffix(){ return retVal; } - +#endif char * config_get_workingdir() { |