From e2e2e60b619f1df8beccbe27cf40b4dcbd82ff57 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 9 Feb 2012 14:07:00 +1100
Subject: [PATCH] s3fs: when samba is logging to stdout, ask smbd to also do so

this prevents make test getting spurious errors about opening log
files in the install prefix
---
 file_server/file_server.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/file_server/file_server.c b/file_server/file_server.c
index 2c5ec43fe1b..3f5ca772080 100644
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -101,7 +101,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;
-- 
2.11.4.GIT