The branch, master has been updated
via 2f2cdaf debug: Fix default log levels
from d5065ed Prevent clashes between system and Samba SHA functions
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2f2cdaf644337ef577de8044f1c223203d87141b
Author: Volker Lendecke <[email protected]>
Date: Wed Jun 3 14:34:31 2015 +0000
debug: Fix default log levels
According to man smb.conf, the log level with the "logging=" parameter is
separated by @, not :.
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Christof Schmitt <[email protected]>
Autobuild-User(master): Christof Schmitt <[email protected]>
Autobuild-Date(master): Thu Jun 4 01:01:35 CEST 2015 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/util/debug.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/debug.c b/lib/util/debug.c
index 81d0cf6..44338c5 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -783,10 +783,10 @@ void debug_set_settings(struct debug_settings *settings,
if (len == 0) {
if (syslog_only) {
snprintf(fake_param, sizeof(fake_param),
- "syslog:%d", syslog_level - 1);
+ "syslog@%d", syslog_level - 1);
} else {
snprintf(fake_param, sizeof(fake_param),
- "syslog:%d file:%d", syslog_level -1,
+ "syslog@%d file@%d", syslog_level -1,
MAX_DEBUG_LEVEL);
}
--
Samba Shared Repository
