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

ITS#3705: bailout if unknown config directive is found

Browse Source
This commit is contained in:
Pierangelo Masarati 2005-05-04 18:46:45 +00:00
parent b76e95e72c
commit 87d7ca8957
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
servers/slapd/config.c
View File

@ -43,6 +43,13 @@
#define ARGS_STEP 512
/*
* ITS#3705: bail out if unknown config directives appear in slapd.conf
*/
#ifdef LDAP_DEVEL
#define SLAPD_CONF_UNKNOWN_BAILOUT
#endif /* LDAP_DEVEL */
/*
* defaults for various global variables
*/
@ -607,10 +614,16 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
if ( rc ) {
switch(rc) {
case SLAP_CONF_UNKNOWN:
#ifdef SLAPD_CONF_UNKNOWN_BAILOUT
Debug(LDAP_DEBUG_CONFIG, "%s: "
"unknown directive <%s> inside backend info definition\n",
c->log, *c->argv, 0);
#else /* !SLAPD_CONF_UNKNOWN_BAILOUT */
Debug(LDAP_DEBUG_CONFIG, "%s: "
"unknown directive <%s> inside backend info definition (ignored)\n",
c->log, *c->argv, 0);
continue;
#endif /* !SLAPD_CONF_UNKNOWN_BAILOUT */
default:
rc = 1;
goto leave;
@ -632,11 +645,18 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
if ( rc ) {
switch(rc) {
case SLAP_CONF_UNKNOWN:
#ifdef SLAPD_CONF_UNKNOWN_BAILOUT
Debug( LDAP_DEBUG_CONFIG, "%s: "
"unknown directive <%s> inside backend database "
"definition\n",
c->log, *c->argv, 0);
#else /* !SLAPD_CONF_UNKNOWN_BAILOUT */
Debug( LDAP_DEBUG_CONFIG, "%s: "
"unknown directive <%s> inside backend database "
"definition (ignored)\n",
c->log, *c->argv, 0);
continue;
#endif /* !SLAPD_CONF_UNKNOWN_BAILOUT */
default:
rc = 1;
goto leave;
@ -648,10 +668,16 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
if ( rc ) {
switch(rc) {
case SLAP_CONF_UNKNOWN:
#ifdef SLAPD_CONF_UNKNOWN_BAILOUT
Debug( LDAP_DEBUG_CONFIG, "%s: "
"unknown directive <%s> inside global database definition\n",
c->log, *c->argv, 0);
#else /* !SLAPD_CONF_UNKNOWN_BAILOUT */
Debug( LDAP_DEBUG_CONFIG, "%s: "
"unknown directive <%s> inside global database definition (ignored)\n",
c->log, *c->argv, 0);
continue;
#endif /* SLAPD_CONF_UNKNOWN_BAILOUT */
default:
rc = 1;
goto leave;
@ -659,11 +685,18 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
}
} else {
#ifdef SLAPD_CONF_UNKNOWN_BAILOUT
Debug(LDAP_DEBUG_CONFIG, "%s: "
"unknown directive <%s> outside backend info and database definitions\n",
c->log, *c->argv, 0);
rc = 1;
goto leave;
#else /* !SLAPD_CONF_UNKNOWN_BAILOUT */
Debug(LDAP_DEBUG_CONFIG, "%s: "
"unknown directive <%s> outside backend info and database definitions (ignored)\n",
c->log, *c->argv, 0);
continue;
#endif /* SLAPD_CONF_UNKNOWN_BAILOUT */
}
}