upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-26 09:39:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9016 Check confdir is empty before generating from scratch

Browse source
This commit is contained in:
Ondřej Kuzník 2021-03-17 16:17:27 +00:00 committed by Quanah Gibson-Mount
parent d28a933b70
commit 3c12993fbe
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
servers/slapd/bconfig.c
View file

@ -23,6 +23,7 @@
#include <stdio.h>
#include <ac/string.h>
#include <ac/ctype.h>
#include <ac/dirent.h>
#include <ac/errno.h>
#include <sys/stat.h>
#include <ac/unistd.h>
@ -4520,6 +4521,21 @@ config_setup_ldif( BackendDB *be, const char *dir, int readit ) {
rc = op->o_bd->be_add( op, &rs );
}
ldap_pvt_thread_pool_context_reset( thrctx );
} else {
/* ITS#9016 Check directory is empty (except perhaps hidden files) */
DIR *dir_of_path;
struct dirent *entry;
dir_of_path = opendir( dir );
while ( (entry = readdir( dir_of_path )) != NULL ) {
if ( entry->d_name[0] != '.' ) {
Debug( LDAP_DEBUG_ANY, "config_setup_ldif: "
"expected directory %s to be empty!\n",
dir );
rc = LDAP_ALREADY_EXISTS;
break;
}
}
}
/* ITS#4194 - only use if it's present, or we're converting. */