patch to include support for daemontools from Michael Handler

(This used to be commit a8db1b611d83bfd8dcf60f1e6d8fcbf57c798528)

3 files changed, 82 insertions, 4 deletions

diff --git a/docs/docbook/manpages/nmbd.8.sgml b/docs/docbook/manpages/nmbd.8.sgml
index b8986110a6..db920c79a1 100644
--- a/docs/docbook/manpages/nmbd.8.sgml
+++ b/docs/docbook/manpages/nmbd.8.sgml
@@ -17,6 +17,8 @@
 	<cmdsynopsis>
 		<command>nmbd</command>
 		<arg choice="opt">-D</arg>
+		<arg choice="opt">-F</arg>
+		<arg choice="opt">-S</arg>
 		<arg choice="opt">-a</arg>
 		<arg choice="opt">-i</arg>
 		<arg choice="opt">-o</arg>
@@ -87,6 +89,28 @@
 		</varlistentry>
 
 		<varlistentry>
+		<term>-F</term>
+		<listitem><para>If specified, this parameter causes
+		the main <command>nmbd</command> process to not daemonize,
+		i.e. double-fork and disassociate with the terminal.
+		Child processes are still created as normal to service
+		each connection request, but the main process does not
+		exit. This operation mode is suitable for running
+		<command>nmbd</command> under process supervisors such
+		as <command>supervise</command> and <command>svscan</command>
+		from Daniel J. Bernstein's <command>daemontools</command>
+		package, or the AIX process monitor.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-S</term>
+		<listitem><para>If specified, this parameter causes
+		<command>nmbd</command> to log to standard output rather
+		than a file.</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
 		<term>-a</term>
 		<listitem><para>If this parameter is specified, each new 
 		connection will append log messages to the log file.  
@@ -99,8 +123,9 @@
 		server to run "interactively", not as a daemon, even if the
 		server is executed on the command line of a shell. Setting this
 		parameter negates the implicit daemon mode when run from the
-		command line.
-		</para></listitem>
+		command line. <command>nmbd</command> also logs to standard
+		output, as if the <command>-S</command> parameter had been
+		given. </para></listitem>
 		</varlistentry>
 
 		<varlistentry>
diff --git a/docs/docbook/manpages/smbd.8.sgml b/docs/docbook/manpages/smbd.8.sgml
index 4ae8b3148b..9fb80901be 100644
--- a/docs/docbook/manpages/smbd.8.sgml
+++ b/docs/docbook/manpages/smbd.8.sgml
@@ -16,6 +16,8 @@
 	<cmdsynopsis>
 		<command>smbd</command>
 		<arg choice="opt">-D</arg>
+		<arg choice="opt">-F</arg>
+		<arg choice="opt">-S</arg>
 		<arg choice="opt">-i</arg>
 		<arg choice="opt">-h</arg>
 		<arg choice="opt">-V</arg>
@@ -87,12 +89,36 @@
 		</varlistentry>
 
 		<varlistentry>
+		<term>-F</term>
+		<listitem><para>If specified, this parameter causes
+		the main <command>smbd</command> process to not daemonize,
+		i.e. double-fork and disassociate with the terminal.
+		Child processes are still created as normal to service
+		each connection request, but the main process does not
+		exit. This operation mode is suitable for running
+		<command>smbd</command> under process supervisors such
+		as <command>supervise</command> and <command>svscan</command>
+		from Daniel J. Bernstein's <command>daemontools</command>
+		package, or the AIX process monitor.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-S</term>
+		<listitem><para>If specified, this parameter causes
+		<command>smbd</command> to log to standard output rather
+		than a file.</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
 		<term>-i</term>
 		<listitem><para>If this parameter is specified it causes the
 		server to run "interactively", not as a daemon, even if the
 		server is executed on the command line of a shell. Setting this
 		parameter negates the implicit deamon mode when run from the
-		command line.
+		command line. <command>smbd</command> also logs to standard
+		output, as if the <command>-S</command> parameter had been
+		given.
 		</para></listitem>
 		</varlistentry>
 		
diff --git a/docs/docbook/manpages/winbindd.8.sgml b/docs/docbook/manpages/winbindd.8.sgml
index 848f6ed3fa..ccef2fa623 100644
--- a/docs/docbook/manpages/winbindd.8.sgml
+++ b/docs/docbook/manpages/winbindd.8.sgml
@@ -16,6 +16,8 @@
 <refsynopsisdiv>
 	<cmdsynopsis>
 		<command>winbindd</command>
+		<arg choice="opt">-F</arg>
+		<arg choice="opt">-S</arg>
 		<arg choice="opt">-i</arg>
 		<arg choice="opt">-B</arg>
 		<arg choice="opt">-d &lt;debug level&gt;</arg>
@@ -106,6 +108,28 @@ group:          files winbind
 
 	<variablelist>
 		<varlistentry>
+		<term>-F</term>
+		<listitem><para>If specified, this parameter causes
+		the main <command>winbindd</command> process to not daemonize,
+		i.e. double-fork and disassociate with the terminal.
+		Child processes are still created as normal to service
+		each connection request, but the main process does not
+		exit. This operation mode is suitable for running
+		<command>winbindd</command> under process supervisors such
+		as <command>supervise</command> and <command>svscan</command>
+		from Daniel J. Bernstein's <command>daemontools</command>
+		package, or the AIX process monitor.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-S</term>
+		<listitem><para>If specified, this parameter causes
+		<command>winbindd</command> to log to standard output rather
+		than a file.</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
 		<term>-d debuglevel</term>
 		<listitem><para>Sets the debuglevel to an integer between 
 		0 and 100. 0 is for no debugging and 100 is for reams and 
@@ -118,7 +142,10 @@ group:          files winbind
 		<listitem><para>Tells <command>winbindd</command> to not 
 		become a daemon and detach from the current terminal. This 
 		option is used by developers when interactive debugging 
-		of <command>winbindd</command> is required. </para></listitem>
+		of <command>winbindd</command> is required.
+		<command>winbindd</command> also logs to standard output,
+		as if the <command>-S</command> parameter had been given.
+		</para></listitem>
 		</varlistentry>
 
 		<varlistentry>