aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolaus Rath <Nikolaus@rath.org>2012-04-25 09:57:19 -0400
committerJan Kiszka <jan.kiszka@siemens.com>2012-05-01 19:08:44 -0300
commit276eda5735824dd6cf66e1f0951aa8af97354540 (patch)
tree9f1f612c63c8c64d9af57da89a5231f575d18483
parentde305b1387dad4473ae4cec48467d10d949e0f10 (diff)
Declare state directory in smb.conf
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 <Nikolaus@rath.org> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
-rw-r--r--net/slirp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/slirp.c b/net/slirp.c
index f49043b5ae..96f5032c4c 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);