commit 2c3445bb850fbfb4481e9487d8852f10e8c74e4c
author Peter Maydell <peter.maydell@linaro.org> Wed Mar 12 12:47:26 2014 +0000
committer Peter Maydell <peter.maydell@linaro.org> Wed Mar 12 12:47:26 2014 +0000
tree 8915a4e531121882809c7fa997db9b0983f5e724
parent 7602e3e4a36715f8de9932dfd489cc4a2c6a7807
parent 5c1e1890bfa1f6b4bc3f51e368bfd47af1b60db0

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>

net/slirp.c

diff --git a/net/slirp.c b/net/slirp.c
index 124e953..cce026b 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -529,7 +529,8 @@
             "state directory=%s\n"
             "log file=%s/log.smbd\n"
             "smb passwd file=%s/smbpasswd\n"
-            "security = share\n"
+            "security = user\n"
+            "map to guest = Bad User\n"
             "[qemu]\n"
             "path=%s\n"
             "read only=no\n"
@@ -549,7 +550,8 @@
     snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -s %s",
              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);
         error_report("conflicting/invalid smbserver address");
         return -1;