[Qemu-devel] [PATCH 2/2] Declare state directory in smb.conf

[Jan Kiszka]

From: Nikolaus Rath <address@hidden>

The smb.conf generated by the userspace networking does not include a state 
directory
directive. Samba therefore falls back to the default value. Since the user 
generally
does not have write access to this path, smbd immediately crashes.

The "state directory" option was added in Samba 3.4.0 (commit
http://gitweb.samba.org/?p=samba.git;a=commit;h=7b02e05eb64f3ffd7aa1cf027d10a7343c0da757).

This patch adds the missing option.

Signed-off-by: Nikolaus Rath <address@hidden>
Signed-off-by: Jan Kiszka <address@hidden>
---
 net/slirp.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/slirp.c b/net/slirp.c
index f49043b..96f5032 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -510,6 +510,7 @@ static int slirp_smb(SlirpState* s, const char 
*exported_dir,
             "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"
@@ -522,6 +523,7 @@ static int slirp_smb(SlirpState* s, const char 
*exported_dir,
             s->smb_dir,
             s->smb_dir,
             s->smb_dir,
+            s->smb_dir,
             exported_dir
             );
     fclose(f);
-- 
1.7.3.4