git.samba.org
/
tridge
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fce4049
)
s3fs: when samba is logging to stdout, ask smbd to also do so
author
Andrew Tridgell
<tridge@samba.org>
Thu, 9 Feb 2012 03:07:00 +0000
(14:07 +1100)
committer
Andrew Tridgell
<tridge@samba.org>
Thu, 9 Feb 2012 04:41:49 +0000
(15:41 +1100)
this prevents make test getting spurious errors about opening log
files in the install prefix
file_server/file_server.c
patch
|
blob
|
history
diff --git
a/file_server/file_server.c
b/file_server/file_server.c
index 917e12c9c0c560159d30cdbbd8f4d32e8580edd6..c6dff5133b768df7dfdd6e5b3aae03a9523ffd1b 100644
(file)
--- a/
file_server/file_server.c
+++ b/
file_server/file_server.c
@@
-102,7
+102,9
@@
static void s3fs_task_init(struct task_server *task)
req = samba_runcmd_send(task, task->event_ctx, timeval_zero(), 1, 0,
smbd_cmd,
"--configfile", fileserver_conf,
- "--foreground", NULL);
+ "--foreground",
+ debug_get_output_is_stdout()?"--log-stdout":NULL,
+ NULL);
if (req == NULL) {
DEBUG(0, ("Failed to start smbd as child daemon\n"));
goto failed;