[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 09/23] net/slirp: specify logbase for smbd
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 09/23] net/slirp: specify logbase for smbd |
Date: |
Sun, 2 Nov 2014 14:57:21 +0300 |
It looks like smbd always logs to /var/log/samba/log.$progname
even if config file specifies different logfile -- when it needs
to log something before completing reading the config file. But
if it can't open it for writing, it fails and exits. Tell smbd
to use our temp dir as logbase (-l option) to avoid that.
The same option is used by samba3 and samba4, so there should
be no incompatible changes.
Signed-off-by: Michael Tokarev <address@hidden>
Reviewed-by: Jan Kiszka <address@hidden>
Tested-by: Jan Kiszka <address@hidden>
---
net/slirp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/slirp.c b/net/slirp.c
index c171119..920af30 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -549,8 +549,8 @@ static int slirp_smb(SlirpState* s, const char
*exported_dir,
);
fclose(f);
- snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -s %s",
- CONFIG_SMBD_COMMAND, smb_conf);
+ snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -l %s -s %s",
+ CONFIG_SMBD_COMMAND, s->smb_dir, smb_conf);
if (slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 139) < 0 ||
slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 445) < 0) {
--
1.7.10.4
- [Qemu-trivial] [PULL 11/23] virtio-9p-proxy: Fix sockfd leak, (continued)
- [Qemu-trivial] [PULL 11/23] virtio-9p-proxy: Fix sockfd leak, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 03/23] bitmap.h: Don't include qemu-common.h, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 04/23] target-xtensa: mark XtensaConfig structs as unused, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 17/23] pidfile: stop making pidfile error a special case, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 12/23] virtio-9p-proxy: fix error return in proxy_init(), Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 07/23] util: Improve os_mem_prealloc error message, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 05/23] target-arm: A64: remove redundant store, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 06/23] sparse: fix build, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 08/23] Revert "os-posix: report error message when lock file failed", Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 23/23] vdi: wrapped uuid_unparse() in #ifdef, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 09/23] net/slirp: specify logbase for smbd,
Michael Tokarev <=
- [Qemu-trivial] [PULL 15/23] os-posix: use global daemon_pipe instead of cryptic fds[1], Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 22/23] tap: fix possible fd leak in net_init_tap, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 13/23] virtio-9p-proxy: improve error messages in connect_namedsocket(), Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 21/23] tap: do not close(fd) in net_init_tap_one, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 18/23] os-posix: reorder parent notification for -daemonize, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 10/23] target-tricore: check return value before using it, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 20/23] target-i386: Remove unused model_features_t struct, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 19/23] tap_int.h: remove repeating NETWORK_SCRIPT defines, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 16/23] os-posix: replace goto again with a proper loop, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 14/23] dump: Fix dump-guest-memory termination and use-after-close, Michael Tokarev, 2014/11/02