Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10406/ldap/servers/slapd
Modified Files: daemon.c libglobs.c Log Message: 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
Index: daemon.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/daemon.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- daemon.c 17 Oct 2008 22:12:47 -0000 1.21 +++ daemon.c 23 Oct 2008 22:42:54 -0000 1.22 @@ -2172,6 +2172,7 @@ } }
+#if defined(ENABLE_AUTO_DN_SUFFIX) if(ret) { /* create phony auth dn? */ @@ -2209,6 +2210,7 @@ ret = 0; } } +#endif }
bail:
Index: libglobs.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libglobs.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- libglobs.c 15 Oct 2008 06:30:05 -0000 1.26 +++ libglobs.c 23 Oct 2008 22:42:55 -0000 1.27 @@ -483,9 +483,11 @@ {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 @@ 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 @@ 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 @@ } return retVal; } +#endif
int @@ -3420,6 +3426,7 @@ 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 @@
return retVal; } - +#endif
char * config_get_workingdir() {
389-commits@lists.fedoraproject.org