Commit 66c62841 authored by Howard Chu's avatar Howard Chu
Browse files

ITS#6949 fixup loglevel delete, consolidate redundant code

parent 10fb8c0a
...@@ -4009,12 +4009,7 @@ config_loglevel(ConfigArgs *c) { ...@@ -4009,12 +4009,7 @@ config_loglevel(ConfigArgs *c) {
i = verb_to_mask( c->line, loglevel_ops ); i = verb_to_mask( c->line, loglevel_ops );
config_syslog &= ~loglevel_ops[i].mask; config_syslog &= ~loglevel_ops[i].mask;
} }
if ( slapMode & SLAP_SERVER_MODE ) { goto reset;
slap_debug = slap_debug_orig;
if ( !logfile_only )
ldap_syslog = config_syslog;
}
return 0;
} }
for( i=1; i < c->argc; i++ ) { for( i=1; i < c->argc; i++ ) {
...@@ -4041,6 +4036,8 @@ config_loglevel(ConfigArgs *c) { ...@@ -4041,6 +4036,8 @@ config_loglevel(ConfigArgs *c) {
else else
config_syslog = 0; config_syslog = 0;
} }
reset:
if ( slapMode & SLAP_SERVER_MODE ) { if ( slapMode & SLAP_SERVER_MODE ) {
if ( logfile_only ) { if ( logfile_only ) {
slap_debug = slap_debug_orig | config_syslog; slap_debug = slap_debug_orig | config_syslog;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment