From f8a97897ad4b152347df1efdcc7452b1536d1ab0 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sun, 28 Aug 2005 07:15:11 +0000 Subject: [PATCH] More for ITS#3937, pick up pre-set ldap_syslog values. --- servers/slapd/bconfig.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c index 6b75c27b91..2499369b6d 100644 --- a/servers/slapd/bconfig.c +++ b/servers/slapd/bconfig.c @@ -1977,6 +1977,9 @@ config_loglevel(ConfigArgs *c) { } if (c->op == SLAP_CONFIG_EMIT) { + /* Get default or commandline slapd setting */ + if ( ldap_syslog && !config_syslog ) + config_syslog = ldap_syslog; return mask_to_verbs( loglevel_ops, config_syslog, &c->rvalue_vals ); } else if ( c->op == LDAP_MOD_DELETE ) { if ( !c->line ) { @@ -2013,9 +2016,9 @@ config_loglevel(ConfigArgs *c) { } } config_syslog |= level; - if ( slapMode & SLAP_SERVER_MODE ) { - ldap_syslog = config_syslog; - } + } + if ( slapMode & SLAP_SERVER_MODE ) { + ldap_syslog = config_syslog; } return(0); } -- 2.39.5