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

cleanup handling of unknown directives ...

Browse Source
This commit is contained in:
Pierangelo Masarati 2003-12-09 23:49:13 +00:00
parent 14b170ce20
commit 0176e02398
1 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
servers/slapd/config.c
View File

@ -2470,34 +2470,56 @@ read_config( const char *fname, int depth )
/* pass anything else to the current backend info/db config routine */
} else {
if ( bi != NULL ) {
if ( bi->bi_config &&
( rc = (*bi->bi_config)( bi, fname, lineno, cargc, cargv ))
!= 0 && rc != SLAP_CONF_UNKNOWN ) return ( 1 );
if ( bi->bi_config ) {
rc = (*bi->bi_config)( bi, fname, lineno, cargc, cargv );
switch ( rc ) {
case 0:
break;
case SLAP_CONF_UNKNOWN:
#ifdef NEW_LOGGING
LDAP_LOG( CONFIG, INFO,
"%s: line %d: unknown directive \"%s\" inside "
"backend info definition (ignored).\n",
fname, lineno, cargv[0] );
LDAP_LOG( CONFIG, INFO,
"%s: line %d: unknown directive \"%s\" inside "
"backend info definition (ignored).\n",
fname, lineno, cargv[0] );
#else
Debug( LDAP_DEBUG_ANY,
Debug( LDAP_DEBUG_ANY,
"%s: line %d: unknown directive \"%s\" inside backend info definition (ignored)\n",
fname, lineno, cargv[0] );
fname, lineno, cargv[0] );
#endif
break;
default:
return 1;
}
}
} else if ( be != NULL ) {
if ( be->be_config &&
( rc = (*be->be_config)( be, fname, lineno, cargc, cargv ))
!= 0 && rc != SLAP_CONF_UNKNOWN ) return ( 1 );
if ( be->be_config ) {
rc = (*be->be_config)( be, fname, lineno, cargc, cargv );
switch ( rc ) {
case 0:
break;
case SLAP_CONF_UNKNOWN:
#ifdef NEW_LOGGING
LDAP_LOG( CONFIG, INFO,
"%s: line %d: unknown directive \"%s\" inside "
"backend database definition (ignored).\n",
fname, lineno, cargv[0] );
LDAP_LOG( CONFIG, INFO,
"%s: line %d: unknown directive \"%s\" inside "
"backend database definition (ignored).\n",
fname, lineno, cargv[0] );
#else
Debug( LDAP_DEBUG_ANY,
Debug( LDAP_DEBUG_ANY,
"%s: line %d: unknown directive \"%s\" inside backend database definition (ignored)\n",
fname, lineno, cargv[0] );
fname, lineno, cargv[0] );
#endif
break;
default:
return 1;
}
}
} else {
#ifdef NEW_LOGGING