mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix slapadd of config tree, broken by ITS#4194

Browse Source
This commit is contained in:
Howard Chu 2006-04-27 23:52:53 +00:00
parent f3ee4f5d30
commit 3879cac787
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
servers/slapd/bconfig.c
View File

@ -3112,10 +3112,18 @@ read_config(const char *fname, const char *dir) {
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.
* then we were supposed to read the dir. Unless we're
* trying to slapadd the dir...
*/
if ( dir && !fname )
return 1;
if ( dir && !fname ) {
if ( slapMode & (SLAP_SERVER_MODE|SLAP_TOOL_READMAIN|SLAP_TOOL_READONLY))
return 1;
/* Assume it's slapadd with a config dir, let it continue */
rc = 0;
cfb->cb_got_ldif = 1;
cfb->cb_use_ldif = 1;
goto done;
}
}
/* If we read the config from back-ldif, nothing to do here */
@ -3135,25 +3143,6 @@ read_config(const char *fname, const char *dir) {
if ( rc == 0 )
ber_str2bv( cfname, 0, 1, &cfb->cb_config->c_file );
/* If we got this far and failed, it may be a serious problem. In server
* mode, we should never come to this. However, it may be alright if we're
* using slapadd to create the conf dir.
*/
while ( rc ) {
if ( slapMode & (SLAP_SERVER_MODE|SLAP_TOOL_READMAIN|SLAP_TOOL_READONLY))
break;
/* If a config file was explicitly given, fail */
if ( fname )
break;
/* Seems to be slapadd with a config dir, let it continue */
if ( cfb->cb_use_ldif ) {
rc = 0;
cfb->cb_got_ldif = 1;
}
break;
}
done:
if ( rc == 0 && BER_BVISNULL( &frontendDB->be_schemadn ) ) {
ber_str2bv( SLAPD_SCHEMA_DN, STRLENOF( SLAPD_SCHEMA_DN ), 1,