diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2012-07-05 19:35:57 +0200 |
|---|---|---|
| committer | Jan Kiszka <jan.kiszka@siemens.com> | 2012-07-09 17:38:13 +0200 |
| commit | 1cb1c5d10bb9e180bd3f7be2c10b212ed86a97b4 (patch) | |
| tree | 7bd715454424cd30941437ae4cd716469decc632 /net/slirp.c | |
| parent | 84988cf910a6881f2180fdcec516b60f8f0dc8c4 (diff) | |
| download | qemu-1cb1c5d10bb9e180bd3f7be2c10b212ed86a97b4.tar.gz | |
slirp: Enforce host-side user of smb share
Windows 7 (and possibly other versions) cannot connect to the samba
share if the exported host directory is not world-readable. This can be
resolved by forcing the username used for access checks to the one
under which QEMU and smbd are running.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Diffstat (limited to 'net/slirp.c')
| -rw-r--r-- | net/slirp.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/net/slirp.c b/net/slirp.c index 37b6ccfde9..a43b5764e1 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -26,6 +26,7 @@ #include "config-host.h" #ifndef _WIN32 +#include <pwd.h> #include <sys/wait.h> #endif #include "net.h" @@ -487,8 +488,15 @@ static int slirp_smb(SlirpState* s, const char *exported_dir, static int instance; char smb_conf[128]; char smb_cmdline[128]; + struct passwd *passwd; FILE *f; + passwd = getpwuid(geteuid()); + if (!passwd) { + error_report("failed to retrieve user name"); + return -1; + } + snprintf(s->smb_dir, sizeof(s->smb_dir), "/tmp/qemu-smb.%ld-%d", (long)getpid(), instance++); if (mkdir(s->smb_dir, 0700) < 0) { @@ -517,14 +525,16 @@ static int slirp_smb(SlirpState* s, const char *exported_dir, "[qemu]\n" "path=%s\n" "read only=no\n" - "guest ok=yes\n", + "guest ok=yes\n" + "force user=%s\n", s->smb_dir, s->smb_dir, s->smb_dir, s->smb_dir, s->smb_dir, s->smb_dir, - exported_dir + exported_dir, + passwd->pw_name ); fclose(f); |