ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/kiszka/queues/slirp' into staging 

* remotes/kiszka/queues/slirp:
  slirp smb with modern win guests when samba is also running on host
  qemu/slirp: Fix SMB security configuration on newer samba versions

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2014-03-12 12:47:26 +00:00
parent 7602e3e4a3 5c1e1890bf
commit 2c3445bb85
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/slirp.c
View File

@ -529,7 +529,8 @@ static int slirp_smb(SlirpState* s, const char *exported_dir,
"state directory=%s\n" "state directory=%s\n"
"log file=%s/log.smbd\n" "log file=%s/log.smbd\n"
"smb passwd file=%s/smbpasswd\n" "smb passwd file=%s/smbpasswd\n"
"security = share\n" "security = user\n"
"map to guest = Bad User\n"
"[qemu]\n" "[qemu]\n"
"path=%s\n" "path=%s\n"
"read only=no\n" "read only=no\n"
@ -549,7 +550,8 @@ static int slirp_smb(SlirpState* s, const char *exported_dir,
snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -s %s", snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -s %s",
CONFIG_SMBD_COMMAND, smb_conf); CONFIG_SMBD_COMMAND, smb_conf);
if (slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 139) < 0) { 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) {
slirp_smb_cleanup(s); slirp_smb_cleanup(s);
error_report("conflicting/invalid smbserver address"); error_report("conflicting/invalid smbserver address");
return -1; return -1;