patch to include support for daemontools from Michael Handler

(This used to be commit a8db1b611d83bfd8dcf60f1e6d8fcbf57c798528)

4 files changed, 68 insertions, 11 deletions

diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index 057adb8bed..ff98f0ce44 100644
--- a/docs/manpages/nmbd.8
+++ b/docs/manpages/nmbd.8
@@ -3,12 +3,12 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "NMBD" "8" "26 November 2002" "" ""
+.TH "NMBD" "8" "03 January 2003" "" ""
 .SH NAME
 nmbd \- NetBIOS name server to provide NetBIOS  over IP naming services to clients
 .SH SYNOPSIS
 
-\fBnmbd\fR [ \fB-D\fR ] [ \fB-a\fR ] [ \fB-i\fR ] [ \fB-o\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-d <debug level>\fR ] [ \fB-H <lmhosts file>\fR ] [ \fB-l <log directory>\fR ] [ \fB-n <primary netbios name>\fR ] [ \fB-p <port number>\fR ] [ \fB-s <configuration file>\fR ]
+\fBnmbd\fR [ \fB-D\fR ] [ \fB-F\fR ] [ \fB-S\fR ] [ \fB-a\fR ] [ \fB-i\fR ] [ \fB-o\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-d <debug level>\fR ] [ \fB-H <lmhosts file>\fR ] [ \fB-l <log directory>\fR ] [ \fB-n <primary netbios name>\fR ] [ \fB-p <port number>\fR ] [ \fB-s <configuration file>\fR ]
 
 .SH "DESCRIPTION"
 .PP
@@ -57,6 +57,23 @@ will operate as a daemon if launched from a command shell.
 nmbd can also be operated from the \fBinetd\fR 
 meta-daemon, although this is not recommended.
 .TP
+\fB-F\fR
+If specified, this parameter causes
+the main \fBnmbd\fR 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
+\fBnmbd\fR under process supervisors such
+as \fBsupervise\fR and \fBsvscan\fR
+from Daniel J. Bernstein's \fBdaemontools\fR
+package, or the AIX process monitor.
+.TP
+\fB-S\fR
+If specified, this parameter causes
+\fBnmbd\fR to log to standard output rather
+than a file.
+.TP
 \fB-a\fR
 If this parameter is specified, each new 
 connection will append log messages to the log file.  
@@ -67,7 +84,9 @@ 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 daemon mode when run from the
-command line.
+command line. \fBnmbd\fR also logs to standard
+output, as if the \fB-S\fR parameter had been
+given. 
 .TP
 \fB-o\fR
 If this parameter is specified, the 
diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index 3e350f80e9..0c8cae0d3e 100644
--- a/docs/manpages/smbd.8
+++ b/docs/manpages/smbd.8
@@ -3,12 +3,12 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBD" "8" "26 November 2002" "" ""
+.TH "SMBD" "8" "03 January 2003" "" ""
 .SH NAME
 smbd \- server to provide SMB/CIFS services to clients
 .SH SYNOPSIS
 
-\fBsmbd\fR [ \fB-D\fR ] [ \fB-i\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-b\fR ] [ \fB-d <debug level>\fR ] [ \fB-l <log directory>\fR ] [ \fB-p <port number>\fR ] [ \fB-O <socket option>\fR ] [ \fB-s <configuration file>\fR ]
+\fBsmbd\fR [ \fB-D\fR ] [ \fB-F\fR ] [ \fB-S\fR ] [ \fB-i\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-b\fR ] [ \fB-d <debug level>\fR ] [ \fB-l <log directory>\fR ] [ \fB-p <port number>\fR ] [ \fB-O <socket option>\fR ] [ \fB-s <configuration file>\fR ]
 
 .SH "DESCRIPTION"
 .PP
@@ -60,12 +60,31 @@ servers that provide more than casual use file and
 print services.  This switch is assumed if \fBsmbd
 \fR is executed on the command line of a shell.
 .TP
+\fB-F\fR
+If specified, this parameter causes
+the main \fBsmbd\fR 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
+\fBsmbd\fR under process supervisors such
+as \fBsupervise\fR and \fBsvscan\fR
+from Daniel J. Bernstein's \fBdaemontools\fR
+package, or the AIX process monitor.
+.TP
+\fB-S\fR
+If specified, this parameter causes
+\fBsmbd\fR to log to standard output rather
+than a file.
+.TP
 \fB-i\fR
 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. \fBsmbd\fR also logs to standard
+output, as if the \fB-S\fR parameter had been
+given.
 .TP
 \fB-h\fR
 Prints the help information (usage) 
diff --git a/docs/manpages/smbgroupedit.8 b/docs/manpages/smbgroupedit.8
index 3ee7980e5d..b514b99793 100644
--- a/docs/manpages/smbgroupedit.8
+++ b/docs/manpages/smbgroupedit.8
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBGROUPEDIT" "8" "01 October 2002" "" ""
+.TH "SMBGROUPEDIT" "8" "03 January 2003" "" ""
 .SH NAME
 smbgroupedit \- Query/set/change UNIX - Windows NT group mapping
 .SH SYNOPSIS
@@ -111,7 +111,7 @@ map the unix domadm group to the Windows NT
 .nf
 root# \fBsmbgroupedit \\
 -c S-1-5-21-1108995562-3116817432-1375597819-512 \\
--u domadm\fR
+-u domadm -td\fR
 .fi
 
 \fBwarning:\fR don't copy and paste this sample, the
diff --git a/docs/manpages/winbindd.8 b/docs/manpages/winbindd.8
index 2cd25af942..8cfb403723 100644
--- a/docs/manpages/winbindd.8
+++ b/docs/manpages/winbindd.8
@@ -3,12 +3,12 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "WINBINDD" "8" "26 November 2002" "" ""
+.TH "WINBINDD" "8" "03 January 2003" "" ""
 .SH NAME
 winbindd \- Name Service Switch daemon for resolving names  from NT servers
 .SH SYNOPSIS
 
-\fBwinbindd\fR [ \fB-i\fR ] [ \fB-B\fR ] [ \fB-d <debug level>\fR ] [ \fB-s <smb config file>\fR ] [ \fB-n\fR ]
+\fBwinbindd\fR [ \fB-F\fR ] [ \fB-S\fR ] [ \fB-i\fR ] [ \fB-B\fR ] [ \fB-d <debug level>\fR ] [ \fB-s <smb config file>\fR ] [ \fB-n\fR ]
 
 .SH "DESCRIPTION"
 .PP
@@ -74,6 +74,23 @@ resolve hostnames from \fI/etc/hosts\fR and then from the
 WINS server.
 .SH "OPTIONS"
 .TP
+\fB-F\fR
+If specified, this parameter causes
+the main \fBwinbindd\fR 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
+\fBwinbindd\fR under process supervisors such
+as \fBsupervise\fR and \fBsvscan\fR
+from Daniel J. Bernstein's \fBdaemontools\fR
+package, or the AIX process monitor.
+.TP
+\fB-S\fR
+If specified, this parameter causes
+\fBwinbindd\fR to log to standard output rather
+than a file.
+.TP
 \fB-d debuglevel\fR
 Sets the debuglevel to an integer between 
 0 and 100. 0 is for no debugging and 100 is for reams and 
@@ -84,7 +101,9 @@ level 100 (see BUGS.txt).
 Tells \fBwinbindd\fR to not 
 become a daemon and detach from the current terminal. This 
 option is used by developers when interactive debugging 
-of \fBwinbindd\fR is required. 
+of \fBwinbindd\fR is required.
+\fBwinbindd\fR also logs to standard output,
+as if the \fB-S\fR parameter had been given.
 .TP
 \fB-n\fR
 Disable caching. This means winbindd will