patch to include support for daemontools from Michael Handler

(This used to be commit a8db1b611d83bfd8dcf60f1e6d8fcbf57c798528)

1 files changed, 59 insertions, 10 deletions

diff --git a/docs/htmldocs/nmbd.8.html b/docs/htmldocs/nmbd.8.html
index c427e488dc..1183a14522 100644
--- a/docs/htmldocs/nmbd.8.html
+++ b/docs/htmldocs/nmbd.8.html
@@ -35,12 +35,12 @@ NAME="AEN8"><H2
 ><B
 CLASS="COMMAND"
 >nmbd</B
-> [-D] [-a] [-i] [-o] [-h] [-V] [-d &#60;debug level&#62;] [-H &#60;lmhosts file&#62;] [-l &#60;log directory&#62;] [-n &#60;primary netbios name&#62;] [-p &#60;port number&#62;] [-s &#60;configuration file&#62;]</P
+> [-D] [-F] [-S] [-a] [-i] [-o] [-h] [-V] [-d &#60;debug level&#62;] [-H &#60;lmhosts file&#62;] [-l &#60;log directory&#62;] [-n &#60;primary netbios name&#62;] [-p &#60;port number&#62;] [-s &#60;configuration file&#62;]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23"
+NAME="AEN25"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -111,7 +111,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN40"
+NAME="AEN42"
 ></A
 ><H2
 >OPTIONS</H2
@@ -143,6 +143,48 @@ CLASS="COMMAND"
 		</P
 ></DD
 ><DT
+>-F</DT
+><DD
+><P
+>If specified, this parameter causes
+		the main <B
+CLASS="COMMAND"
+>nmbd</B
+> 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
+		<B
+CLASS="COMMAND"
+>nmbd</B
+> under process supervisors such
+		as <B
+CLASS="COMMAND"
+>supervise</B
+> and <B
+CLASS="COMMAND"
+>svscan</B
+>
+		from Daniel J. Bernstein's <B
+CLASS="COMMAND"
+>daemontools</B
+>
+		package, or the AIX process monitor.
+		</P
+></DD
+><DT
+>-S</DT
+><DD
+><P
+>If specified, this parameter causes
+		<B
+CLASS="COMMAND"
+>nmbd</B
+> to log to standard output rather
+		than a file.</P
+></DD
+><DT
 >-a</DT
 ><DD
 ><P
@@ -158,8 +200,15 @@ CLASS="COMMAND"
 		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.
-		</P
+		command line. <B
+CLASS="COMMAND"
+>nmbd</B
+> also logs to standard
+		output, as if the <B
+CLASS="COMMAND"
+>-S</B
+> parameter had been
+		given. </P
 ></DD
 ><DT
 >-o</DT
@@ -385,7 +434,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN130"
+NAME="AEN148"
 ></A
 ><H2
 >FILES</H2
@@ -541,7 +590,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN177"
+NAME="AEN195"
 ></A
 ><H2
 >SIGNALS</H2
@@ -603,7 +652,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN193"
+NAME="AEN211"
 ></A
 ><H2
 >VERSION</H2
@@ -614,7 +663,7 @@ NAME="AEN193"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN196"
+NAME="AEN214"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -679,7 +728,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN213"
+NAME="AEN231"
 ></A
 ><H2
 >AUTHOR</H2