[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  ffe884c s3: Fix smbd -i
       via  d1697b3 s3: Remove an unused structure field
      from  42cb8ff s3: Add "notify" cmd to smbclient

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ffe884c8db7a3e2c9a3844b55b8075be476a48a8
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 22 14:23:11 2012 +0100

    s3: Fix smbd -i
    
    Autobuild-User: Volker Lendecke <vl at samba.org>
    Autobuild-Date: Thu Mar 22 18:40:02 CET 2012 on sn-devel-104

commit d1697b3eaa3346766cffd9b1577e8df37bffef63
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 22 14:18:13 2012 +0100

    s3: Remove an unused structure field

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/server.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 851b460..ef3f140 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -57,8 +57,6 @@ struct smbd_parent_context {
 	/* the list of current child processes */
 	struct smbd_child_pid *children;
 	size_t num_children;
-	/* pipe for detecting death of parent process in child: */
-	int child_pipe[2];
 
 	struct timed_event *cleanup_te;
 };
@@ -1233,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;


-- 
Samba Shared Repository