diff options
| author | Andrew Tridgell <tridge@samba.org> | 2012-02-09 14:07:00 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-02-28 12:01:08 +0100 |
| commit | e2e2e60b619f1df8beccbe27cf40b4dcbd82ff57 (patch) | |
| tree | 036a6a4fe59657c90a9d36d7c86a9afd114f3426 /file_server | |
| parent | 1da318d97da6c7f9e8d5d389fc06619b423fcda0 (diff) | |
| download | samba-e2e2e60b619f1df8beccbe27cf40b4dcbd82ff57.tar.gz samba-e2e2e60b619f1df8beccbe27cf40b4dcbd82ff57.tar.xz samba-e2e2e60b619f1df8beccbe27cf40b4dcbd82ff57.zip | |
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
Diffstat (limited to 'file_server')
| -rw-r--r-- | file_server/file_server.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/file_server/file_server.c b/file_server/file_server.c index 2c5ec43fe1..3f5ca77208 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; |