From 54de0cbffccffebac71e218e790d66cade12d453 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Fri, 6 May 2005 20:36:59 +0000 Subject: [PATCH] use appropriate log level if bailing out; need to use Debug() instead fprintf( stderr ) in many places... --- servers/slapd/bconfig.c | 18 ++++++++++-------- servers/slapd/config.c | 10 +++++----- servers/slapd/slap.h | 2 ++ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c index 8518613d36..49ef640e9d 100644 --- a/servers/slapd/bconfig.c +++ b/servers/slapd/bconfig.c @@ -1241,9 +1241,10 @@ config_generic(ConfigArgs *c) { default: - Debug(LDAP_DEBUG_ANY, "%s: unknown CFG_TYPE %d" + Debug( SLAPD_DEBUG_CONFIG_ERROR, + "%s: unknown CFG_TYPE %d" SLAPD_CONF_UNKNOWN_IGNORED ".\n", - c->log, c->type, 0); + c->log, c->type, 0 ); #ifdef SLAPD_CONF_UNKNOWN_BAILOUT return 1; #endif /* SLAPD_CONF_UNKNOWN_BAILOUT */ @@ -1431,7 +1432,7 @@ config_sizelimit(ConfigArgs *c) { c->log, c->msg, c->argv[i]); return(1); } else if(next[0] != '\0') { - Debug(LDAP_DEBUG_ANY, "%s: " + Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: " "trailing chars \"%s\" in \"sizelimit \" line" SLAPD_CONF_UNKNOWN_IGNORED ".\n", c->log, next, 0); @@ -1488,7 +1489,7 @@ config_timelimit(ConfigArgs *c) { c->log, c->msg, c->argv[i]); return(1); } else if(next[0] != '\0') { - Debug(LDAP_DEBUG_ANY, "%s: " + Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: " "trailing chars \"%s\" in \"timelimit \" line" SLAPD_CONF_UNKNOWN_IGNORED ".\n", c->log, next, 0); @@ -1512,7 +1513,7 @@ config_overlay(ConfigArgs *c) { } if(c->argv[1][0] == '-' && overlay_config(c->be, &c->argv[1][1])) { /* log error */ - Debug(LDAP_DEBUG_ANY, "%s: (optional) %s overlay \"%s\" configuration failed" + Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: (optional) %s overlay \"%s\" configuration failed" SLAPD_CONF_UNKNOWN_IGNORED ".\n", c->log, c->be == frontendDB ? "global " : "", c->argv[1][1]); #ifdef SLAPD_CONF_UNKNOWN_BAILOUT @@ -1574,7 +1575,8 @@ config_suffix(ConfigArgs *c) { ndn = c->value_ndn; tbe = select_backend(&ndn, 0, 0); if(tbe == c->be) { - Debug(LDAP_DEBUG_ANY, "%s: suffix already served by this backend!" + Debug( SLAPD_DEBUG_CONFIG_ERROR, + "%s: suffix already served by this backend!" SLAPD_CONF_UNKNOWN_IGNORED ".\n", c->log, 0, 0); #ifdef SLAPD_CONF_UNKNOWN_BAILOUT @@ -2114,7 +2116,7 @@ config_replica(ConfigArgs *c) { if(!strncasecmp(c->argv[i], "suffix=", STRLENOF( "suffix="))) { switch(add_replica_suffix(c->be, nr, c->argv[i] + STRLENOF("suffix="))) { case 1: - Debug(LDAP_DEBUG_ANY, "%s: " + Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: " "suffix \"%s\" in \"replica\" line is not valid for backend" SLAPD_CONF_UNKNOWN_IGNORED ".\n", c->log, c->argv[i] + STRLENOF("suffix="), 0); @@ -2123,7 +2125,7 @@ config_replica(ConfigArgs *c) { #endif /* SLAPD_CONF_UNKNOWN_BAILOUT */ break; case 2: - Debug(LDAP_DEBUG_ANY, "%s: " + Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: " "unable to normalize suffix in \"replica\" line" SLAPD_CONF_UNKNOWN_IGNORED ".\n", c->log, 0, 0); diff --git a/servers/slapd/config.c b/servers/slapd/config.c index 143a806358..0af0616762 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -569,7 +569,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf) } if ( c->argc < 1 ) { - Debug(LDAP_DEBUG_CONFIG, "%s: bad config line" + Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: bad config line" SLAPD_CONF_UNKNOWN_IGNORED ".\n", c->log, 0, 0); #ifdef SLAPD_CONF_UNKNOWN_BAILOUT @@ -614,7 +614,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf) if ( rc ) { switch(rc) { case SLAP_CONF_UNKNOWN: - Debug(LDAP_DEBUG_CONFIG, "%s: " + Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: " "unknown directive <%s> inside backend info definition" SLAPD_CONF_UNKNOWN_IGNORED ".\n", c->log, *c->argv, 0); @@ -642,7 +642,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf) if ( rc ) { switch(rc) { case SLAP_CONF_UNKNOWN: - Debug( LDAP_DEBUG_CONFIG, "%s: " + Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: " "unknown directive <%s> inside backend database " "definition" SLAPD_CONF_UNKNOWN_IGNORED ".\n", c->log, *c->argv, 0); @@ -660,7 +660,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf) if ( rc ) { switch(rc) { case SLAP_CONF_UNKNOWN: - Debug( LDAP_DEBUG_CONFIG, "%s: " + Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: " "unknown directive <%s> inside global database definition" SLAPD_CONF_UNKNOWN_IGNORED ".\n", c->log, *c->argv, 0); @@ -674,7 +674,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf) } } else { - Debug(LDAP_DEBUG_CONFIG, "%s: " + Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: " "unknown directive <%s> outside backend info and database definitions" SLAPD_CONF_UNKNOWN_IGNORED ".\n", c->log, *c->argv, 0); diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index 9031c86c46..ec075734e7 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -81,8 +81,10 @@ LDAP_BEGIN_DECL */ #ifdef SLAPD_CONF_UNKNOWN_BAILOUT #define SLAPD_CONF_UNKNOWN_IGNORED "" +#define SLAPD_DEBUG_CONFIG_ERROR LDAP_DEBUG_ANY #else /* ! SLAPD_CONF_UNKNOWN_BAILOUT */ #define SLAPD_CONF_UNKNOWN_IGNORED " (ignored)" +#define SLAPD_DEBUG_CONFIG_ERROR LDAP_DEBUG_CONFIG #endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */ /* -- 2.39.5