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

Fix ITS#4194, require config dir to be usable if only -F is specified.

Browse Source
This commit is contained in:
Howard Chu 2005-11-22 10:11:06 +00:00
parent d0b70826d4
commit 575f6e2251
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
servers/slapd/bconfig.c
View File

@ -2882,7 +2882,9 @@ config_setup_ldif( BackendDB *be, const char *dir, int readit ) {
ldap_pvt_thread_pool_context_reset( thrctx );
}
cfb->cb_use_ldif = 1;
/* ITS#4194 - only use if it's present, or we're converting. */
if ( !readit || rc == LDAP_SUCCESS )
cfb->cb_use_ldif = 1;
return rc;
}
@ -2950,9 +2952,16 @@ read_config(const char *fname, const char *dir) {
/* if fname is defaulted, try reading .d */
rc = config_setup_ldif( be, cfdir, !fname );
/* It's OK if the base object doesn't exist yet */
if ( rc && rc != LDAP_NO_SUCH_OBJECT )
return 1;
if ( rc ) {
/* It may be OK if the base object doesn't exist yet. */
if ( rc != LDAP_NO_SUCH_OBJECT )
return 1;
/* ITS#4194: But if dir was specified and no fname,
* then we were supposed to read the dir.
*/
if ( dir && !fname )
return 1;
}
/* If we read the config from back-ldif, nothing to do here */
if ( cfb->cb_got_ldif ) {