summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-03-22 14:23:11 +0100
committerVolker Lendecke <vl@samba.org>2012-03-22 18:40:02 +0100
commitffe884c8db7a3e2c9a3844b55b8075be476a48a8 (patch)
treee1c8f95de334ede83fbf6ee4a5579f32427a7dd2
parentd1697b3eaa3346766cffd9b1577e8df37bffef63 (diff)
downloadsamba-ffe884c8db7a3e2c9a3844b55b8075be476a48a8.tar.gz
samba-ffe884c8db7a3e2c9a3844b55b8075be476a48a8.tar.bz2
samba-ffe884c8db7a3e2c9a3844b55b8075be476a48a8.zip
s3: Fix smbd -i
Autobuild-User: Volker Lendecke <vl@samba.org> Autobuild-Date: Thu Mar 22 18:40:02 CET 2012 on sn-devel-104
-rw-r--r--source3/smbd/server.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 9cc88d4d1a..ef3f140f78 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1231,15 +1231,17 @@ extern void build_options(bool screen);
exit(1);
}
- /*
- * Do not initialize the parent-child-pipe before becoming
- * a daemon: this is used to detect a died parent in the child
- * process.
- */
- status = init_before_fork();
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("init_before_fork failed: %s\n", nt_errstr(status)));
- exit(1);
+ if (!interactive) {
+ /*
+ * Do not initialize the parent-child-pipe before becoming a
+ * daemon: this is used to detect a died parent in the child
+ * process.
+ */
+ status = init_before_fork();
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("init_before_fork failed: %s\n", nt_errstr(status)));
+ exit(1);
+ }
}
smbd_server_conn->msg_ctx = msg_ctx;