[SCM] Samba Shared Repository - branch v3-6-test updated
Volker Lendecke
vlendec at samba.org
Thu Mar 31 09:21:08 MDT 2011
The branch, v3-6-test has been updated
via 7187655 debug: ignore debug_set_logfile() with a blank string
from d9f71d0 s3: Fix g_lock_lock after the select/poll conversion
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 71876556d5c0b1a22d8eb4e58895c7e6e0c8bf31
Author: Andrew Tridgell <tridge at samba.org>
Date: Tue Mar 29 14:41:58 2011 +1100
debug: ignore debug_set_logfile() with a blank string
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
Autobuild-User: Andrew Tridgell <tridge at samba.org>
Autobuild-Date: Tue Mar 29 07:03:58 CEST 2011 on sn-devel-104
(cherry picked from commit af31bf6bf5ef3af6eaf87ebe2f9f5903698c22db)
-----------------------------------------------------------------------
Summary of changes:
lib/util/debug.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/debug.c b/lib/util/debug.c
index c7ba19e..2ff7cb2 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -493,6 +493,10 @@ void setup_logging(const char *prog_name, enum debug_logtype new_logtype)
void debug_set_logfile(const char *name)
{
+ if (name == NULL || *name == 0) {
+ /* this copes with calls when smb.conf is not loaded yet */
+ return;
+ }
TALLOC_FREE(state.debugf);
state.debugf = talloc_strdup(NULL, name);
}
@@ -564,7 +568,7 @@ bool reopen_logs_internal(void)
if (new_fd == -1) {
log_overflow = true;
- DEBUG(0, ("Unable to open new log file %s: %s\n", state.debugf, strerror(errno)));
+ DEBUG(0, ("Unable to open new log file '%s': %s\n", state.debugf, strerror(errno)));
log_overflow = false;
ret = false;
} else {
--
Samba Shared Repository
More information about the samba-cvs
mailing list