diff options
author | Andrew Bartlett <abartlet@samba.org> | 2010-10-29 14:19:32 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2010-11-02 04:36:04 +0000 |
commit | 9da4ace1d9789d300ab298bc34694c44b2062f30 (patch) | |
tree | 0c4ce1fa4f3a97934c9504263fdfc86a28e39705 /source3/nmbd | |
parent | 4ae27891f8ac0a56d68b0544e78d6c17ade0c1c9 (diff) | |
download | samba-9da4ace1d9789d300ab298bc34694c44b2062f30.tar.gz samba-9da4ace1d9789d300ab298bc34694c44b2062f30.tar.xz samba-9da4ace1d9789d300ab298bc34694c44b2062f30.zip |
s3-debug Impove setup_logging() to specify logging to stderr
This change improves the setup_logging() API so that callers which
wish to set up logging to stderr can simply ask for it, rather than
directly modify the dbf global variable.
Andrew Bartlett
Diffstat (limited to 'source3/nmbd')
-rw-r--r-- | source3/nmbd/nmbd.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index fcbe50842d0..e93ff82333f 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -863,8 +863,11 @@ static bool open_sockets(bool isdaemon, int port) DEBUG(0,("ERROR: Can't log to stdout (-S) unless daemon is in foreground (-F) or interactive (-i)\n")); exit(1); } - - setup_logging( argv[0], log_stdout ); + if (log_stdout) { + setup_logging( argv[0], DEBUG_STDOUT); + } else { + setup_logging( argv[0], DEBUG_FILE); + } reopen_logs(); @@ -1024,8 +1027,8 @@ static bool open_sockets(bool isdaemon, int port) TALLOC_FREE(frame); process(); - if (dbf) - x_fclose(dbf); + debug_close_dbf(); + kill_async_dns_child(); return(0); } |