commit 563987d0a799f90b58a575b190a57546c335191b
author Anthony Liguori <aliguori@us.ibm.com> Tue May 01 18:48:01 2012 -0500
committer Anthony Liguori <aliguori@us.ibm.com> Tue May 01 18:48:01 2012 -0500
tree 6383b008e7be6cefaab9dfeaa1ba7374b322f169
parent 15a0f3bf77cf60ae29484f0c0a26c679e4c688fd
parent 276eda5735824dd6cf66e1f0951aa8af97354540

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

* kiszka/queues/slirp:
  Declare state directory in smb.conf
  slirp: don't use "smb ports = 0" option

net/slirp.c

diff --git a/net/slirp.c b/net/slirp.c
index 18e07ba..96f5032 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -507,10 +507,10 @@
     fprintf(f,
             "[global]\n"
             "private dir=%s\n"
-            "smb ports=0\n"
             "socket address=127.0.0.1\n"
             "pid directory=%s\n"
             "lock directory=%s\n"
+            "state directory=%s\n"
             "log file=%s/log.smbd\n"
             "smb passwd file=%s/smbpasswd\n"
             "security = share\n"
@@ -523,6 +523,7 @@
             s->smb_dir,
             s->smb_dir,
             s->smb_dir,
+            s->smb_dir,
             exported_dir
             );
     fclose(f);