summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/docbook/manpages/smbd.8.sgml2
-rw-r--r--docs/htmldocs/nmbd.8.html124
-rw-r--r--docs/htmldocs/smbd.8.html76
-rw-r--r--docs/htmldocs/smbgroupedit.8.html94
-rw-r--r--docs/htmldocs/winbindd.8.html126
-rw-r--r--docs/manpages/nmbd.825
-rw-r--r--docs/manpages/smbd.825
-rw-r--r--docs/manpages/smbgroupedit.84
-rw-r--r--docs/manpages/winbindd.825
9 files changed, 393 insertions, 108 deletions
diff --git a/docs/docbook/manpages/smbd.8.sgml b/docs/docbook/manpages/smbd.8.sgml
index 6dfb0f5746..a679af6718 100644
--- a/docs/docbook/manpages/smbd.8.sgml
+++ b/docs/docbook/manpages/smbd.8.sgml
@@ -118,7 +118,7 @@
parameter negates the implicit deamon mode when run from the
command line. <command>smbd</command> also logs to standard
output, as if the <command>-S</command> parameter had been
- given. </para></listitem>
+ given.
</para></listitem>
</varlistentry>
diff --git a/docs/htmldocs/nmbd.8.html b/docs/htmldocs/nmbd.8.html
index c9cdb5908b..1183a14522 100644
--- a/docs/htmldocs/nmbd.8.html
+++ b/docs/htmldocs/nmbd.8.html
@@ -1,11 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML
><HEAD
><TITLE
>nmbd</TITLE
><META
NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"></HEAD
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"></HEAD
><BODY
CLASS="REFENTRY"
BGCOLOR="#FFFFFF"
@@ -15,9 +16,7 @@ VLINK="#840084"
ALINK="#0000FF"
><H1
><A
-NAME="NMBD"
-></A
->nmbd</H1
+NAME="NMBD">nmbd</H1
><DIV
CLASS="REFNAMEDIV"
><A
@@ -30,20 +29,18 @@ NAME="AEN5"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN8"
-></A
-><H2
+NAME="AEN8"><H2
>Synopsis</H2
><P
><B
CLASS="COMMAND"
>nmbd</B
-> [-D] [-a] [-i] [-o] [-h] [-V] [-d &lt;debug level&gt;] [-H &lt;lmhosts file&gt;] [-l &lt;log directory&gt;] [-n &lt;primary netbios name&gt;] [-p &lt;port number&gt;] [-s &lt;configuration file&gt;]</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
@@ -72,12 +69,9 @@ CLASS="COMMAND"
specified it will respond with the IP number of the host it
is running on. Its "own NetBIOS name" is by
default the primary DNS name of the host it is running on,
- but this can be overridden with the <SPAN
-CLASS="emphasis"
-><I
+ but this can be overridden with the <I
CLASS="EMPHASIS"
>-n</I
-></SPAN
>
option (see OPTIONS below). Thus <B
CLASS="COMMAND"
@@ -117,7 +111,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN40"
+NAME="AEN42"
></A
><H2
>OPTIONS</H2
@@ -149,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
@@ -164,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
@@ -190,7 +233,7 @@ CLASS="COMMAND"
>.</P
></DD
><DT
->-H &lt;filename&gt;</DT
+>-H &#60;filename&#62;</DT
><DD
><P
>NetBIOS lmhosts file. The lmhosts
@@ -209,24 +252,18 @@ CLASS="FILENAME"
></A
>
to resolve any NetBIOS name queries needed by the server. Note
- that the contents of this file are <SPAN
-CLASS="emphasis"
-><I
+ that the contents of this file are <I
CLASS="EMPHASIS"
>NOT</I
-></SPAN
>
used by <B
CLASS="COMMAND"
>nmbd</B
> to answer any name queries.
Adding a line to this file affects name NetBIOS resolution
- from this host <SPAN
-CLASS="emphasis"
-><I
+ from this host <I
CLASS="EMPHASIS"
>ONLY</I
-></SPAN
>.</P
><P
>The default path to this file is compiled into
@@ -264,7 +301,7 @@ CLASS="COMMAND"
>.</P
></DD
><DT
->-d &lt;debug level&gt;</DT
+>-d &#60;debug level&#62;</DT
><DD
><P
>debuglevel is an integer
@@ -300,7 +337,7 @@ CLASS="FILENAME"
> file.</P
></DD
><DT
->-l &lt;log directory&gt;</DT
+>-l &#60;log directory&#62;</DT
><DD
><P
>The -l parameter specifies a directory
@@ -320,12 +357,9 @@ CLASS="FILENAME"
<TT
CLASS="FILENAME"
>/var/log/log.nmb</TT
->. <SPAN
-CLASS="emphasis"
-><I
+>. <I
CLASS="EMPHASIS"
>Beware:</I
-></SPAN
>
If the directory specified does not exist, <B
CLASS="COMMAND"
@@ -335,7 +369,7 @@ CLASS="COMMAND"
</P
></DD
><DT
->-n &lt;primary NetBIOS name&gt;</DT
+>-n &#60;primary NetBIOS name&#62;</DT
><DD
><P
>This option allows you to override
@@ -360,7 +394,7 @@ CLASS="FILENAME"
>.</P
></DD
><DT
->-p &lt;UDP port number&gt;</DT
+>-p &#60;UDP port number&#62;</DT
><DD
><P
>UDP port number is a positive integer value.
@@ -373,7 +407,7 @@ CLASS="COMMAND"
won't need help!</P
></DD
><DT
->-s &lt;configuration file&gt;</DT
+>-s &#60;configuration file&#62;</DT
><DD
><P
>The default configuration file name
@@ -400,7 +434,7 @@ CLASS="FILENAME"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN130"
+NAME="AEN148"
></A
><H2
>FILES</H2
@@ -523,12 +557,9 @@ CLASS="FILENAME"
>If <B
CLASS="COMMAND"
>nmbd</B
-> is acting as a <SPAN
-CLASS="emphasis"
-><I
+> is acting as a <I
CLASS="EMPHASIS"
> browse master</I
-></SPAN
> (see the <A
HREF="smb.conf.5.html#LOCALMASTER"
TARGET="_top"
@@ -559,7 +590,7 @@ CLASS="FILENAME"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN177"
+NAME="AEN195"
></A
><H2
>SIGNALS</H2
@@ -568,12 +599,9 @@ NAME="AEN177"
CLASS="COMMAND"
>nmbd</B
> process it is recommended
- that SIGKILL (-9) <SPAN
-CLASS="emphasis"
-><I
+ that SIGKILL (-9) <I
CLASS="EMPHASIS"
>NOT</I
-></SPAN
> be used, except as a last
resort, as this may leave the name database in an inconsistent state.
The correct way to terminate <B
@@ -624,7 +652,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN193"
+NAME="AEN211"
></A
><H2
>VERSION</H2
@@ -635,7 +663,7 @@ NAME="AEN193"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN196"
+NAME="AEN214"
></A
><H2
>SEE ALSO</H2
@@ -700,7 +728,7 @@ TARGET="_top"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN213"
+NAME="AEN231"
></A
><H2
>AUTHOR</H2
diff --git a/docs/htmldocs/smbd.8.html b/docs/htmldocs/smbd.8.html
index ff0abc2bd1..4be8a257d3 100644
--- a/docs/htmldocs/smbd.8.html
+++ b/docs/htmldocs/smbd.8.html
@@ -34,12 +34,12 @@ NAME="AEN8"><H2
><B
CLASS="COMMAND"
>smbd</B
-> [-D] [-i] [-h] [-V] [-b] [-d &#60;debug level&#62;] [-l &#60;log directory&#62;] [-p &#60;port number&#62;] [-O &#60;socket option&#62;] [-s &#60;configuration file&#62;]</P
+> [-D] [-F] [-S] [-i] [-h] [-V] [-b] [-d &#60;debug level&#62;] [-l &#60;log directory&#62;] [-p &#60;port number&#62;] [-O &#60;socket option&#62;] [-s &#60;configuration file&#62;]</P
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN21"
+NAME="AEN23"
></A
><H2
>DESCRIPTION</H2
@@ -104,7 +104,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN35"
+NAME="AEN37"
></A
><H2
>OPTIONS</H2
@@ -134,6 +134,48 @@ CLASS="COMMAND"
</P
></DD
><DT
+>-F</DT
+><DD
+><P
+>If specified, this parameter causes
+ the main <B
+CLASS="COMMAND"
+>smbd</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"
+>smbd</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"
+>smbd</B
+> to log to standard output rather
+ than a file.</P
+></DD
+><DT
>-i</DT
><DD
><P
@@ -141,7 +183,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 deamon mode when run from the
- command line.
+ command line. <B
+CLASS="COMMAND"
+>smbd</B
+> also logs to standard
+ output, as if the <B
+CLASS="COMMAND"
+>-S</B
+> parameter had been
+ given.
</P
></DD
><DT
@@ -329,7 +379,7 @@ CLASS="FILENAME"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN105"
+NAME="AEN123"
></A
><H2
>FILES</H2
@@ -441,7 +491,7 @@ CLASS="FILENAME"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN141"
+NAME="AEN159"
></A
><H2
>LIMITATIONS</H2
@@ -460,7 +510,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN145"
+NAME="AEN163"
></A
><H2
>ENVIRONMENT VARIABLES</H2
@@ -491,7 +541,7 @@ CLASS="CONSTANT"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN154"
+NAME="AEN172"
></A
><H2
>PAM INTERACTION</H2
@@ -538,7 +588,7 @@ CLASS="EMPHASIS"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN165"
+NAME="AEN183"
></A
><H2
>VERSION</H2
@@ -549,7 +599,7 @@ NAME="AEN165"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN168"
+NAME="AEN186"
></A
><H2
>DIAGNOSTICS</H2
@@ -572,7 +622,7 @@ NAME="AEN168"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN173"
+NAME="AEN191"
></A
><H2
>SIGNALS</H2
@@ -638,7 +688,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN190"
+NAME="AEN208"
></A
><H2
>SEE ALSO</H2
@@ -704,7 +754,7 @@ TARGET="_top"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN207"
+NAME="AEN225"
></A
><H2
>AUTHOR</H2
diff --git a/docs/htmldocs/smbgroupedit.8.html b/docs/htmldocs/smbgroupedit.8.html
index b93e900dcd..e20b34883c 100644
--- a/docs/htmldocs/smbgroupedit.8.html
+++ b/docs/htmldocs/smbgroupedit.8.html
@@ -1,11 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML
><HEAD
><TITLE
>smbgroupedit</TITLE
><META
NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"></HEAD
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"></HEAD
><BODY
CLASS="REFENTRY"
BGCOLOR="#FFFFFF"
@@ -15,9 +16,7 @@ VLINK="#840084"
ALINK="#0000FF"
><H1
><A
-NAME="SMBGROUPEDIT"
-></A
->smbgroupedit</H1
+NAME="SMBGROUPEDIT">smbgroupedit</H1
><DIV
CLASS="REFNAMEDIV"
><A
@@ -29,15 +28,13 @@ NAME="AEN5"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN8"
-></A
-><H2
+NAME="AEN8"><H2
>Synopsis</H2
><P
><B
CLASS="COMMAND"
>smbroupedit</B
-> [-v [l|s]] [-a UNIX-groupname [-d NT-groupname|-p privilege|]]</P
+> [-v [l|s]] [-a UNIX-groupname [-d NT-groupname|-p privilege|]]</P
></DIV
><DIV
CLASS="REFSECT1"
@@ -89,6 +86,12 @@ CLASS="VARIABLELIST"
><P
>give a long listing, of the format:</P
><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
><PRE
CLASS="PROGRAMLISTING"
>"NT Group Name"
@@ -97,10 +100,19 @@ CLASS="PROGRAMLISTING"
Group type :
Comment :
Privilege :</PRE
+></TD
+></TR
+></TABLE
></P
><P
>For examples,</P
><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
><PRE
CLASS="PROGRAMLISTING"
>Users
@@ -109,6 +121,9 @@ CLASS="PROGRAMLISTING"
Group type: Local group
Comment :
Privilege : No privilege</PRE
+></TD
+></TR
+></TABLE
></P
></DD
><DT
@@ -117,16 +132,34 @@ CLASS="PROGRAMLISTING"
><P
>display a short listing of the format:</P
><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
><PRE
CLASS="PROGRAMLISTING"
>NTGroupName(SID) -&#62; UnixGroupName</PRE
+></TD
+></TR
+></TABLE
></P
><P
>For example,</P
><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
><PRE
CLASS="PROGRAMLISTING"
>Users (S-1-5-32-545) -&#62; -1</PRE
+></TD
+></TR
+></TABLE
></P
></DD
></DL
@@ -211,6 +244,12 @@ TYPE="a"
>Get the SID for the Windows NT "Domain Admins"
group:</P
><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
><PRE
CLASS="PROGRAMLISTING"
><TT
@@ -221,6 +260,9 @@ CLASS="COMMAND"
>smbgroupedit -vs | grep "Domain Admins"</B
>
Domain Admins (S-1-5-21-1108995562-3116817432-1375597819-512) -&#62; -1</PRE
+></TD
+></TR
+></TABLE
></P
></LI
><LI
@@ -229,6 +271,12 @@ Domain Admins (S-1-5-21-1108995562-3116817432-1375597819-512) -&#62; -1</PRE
"Domain Admins" group, by running the command:
</P
><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
><PRE
CLASS="PROGRAMLISTING"
><TT
@@ -238,16 +286,16 @@ CLASS="PROMPT"
CLASS="COMMAND"
>smbgroupedit \
-c S-1-5-21-1108995562-3116817432-1375597819-512 \
--u domadm</B
+-u domadm -td</B
></PRE
+></TD
+></TR
+></TABLE
></P
><P
-> <SPAN
-CLASS="emphasis"
-><I
+> <I
CLASS="EMPHASIS"
>warning:</I
-></SPAN
> don't copy and paste this sample, the
Domain Admins SID (the S-1-5-21-...-512) is different for every PDC.
</P
@@ -258,6 +306,12 @@ CLASS="EMPHASIS"
><P
>To verify that your mapping has taken effect:</P
><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
><PRE
CLASS="PROGRAMLISTING"
><TT
@@ -268,12 +322,21 @@ CLASS="COMMAND"
>smbgroupedit -vs|grep "Domain Admins"</B
>
Domain Admins (S-1-5-21-1108995562-3116817432-1375597819-512) -&#62; domadm</PRE
+></TD
+></TR
+></TABLE
></P
><P
>To give access to a certain directory on a domain member machine (an
NT/W2K or a samba server running winbind) to some users who are member
of a group on your samba PDC, flag that group as a domain group:</P
><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
><PRE
CLASS="PROGRAMLISTING"
><TT
@@ -283,6 +346,9 @@ CLASS="PROMPT"
CLASS="COMMAND"
>smbgroupedit -a unixgroup -td</B
></PRE
+></TD
+></TR
+></TABLE
></P
></DIV
><DIV
diff --git a/docs/htmldocs/winbindd.8.html b/docs/htmldocs/winbindd.8.html
index 09c3513c70..fb8c9c0458 100644
--- a/docs/htmldocs/winbindd.8.html
+++ b/docs/htmldocs/winbindd.8.html
@@ -1,11 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML
><HEAD
><TITLE
>winbindd</TITLE
><META
NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"></HEAD
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"></HEAD
><BODY
CLASS="REFENTRY"
BGCOLOR="#FFFFFF"
@@ -15,9 +16,7 @@ VLINK="#840084"
ALINK="#0000FF"
><H1
><A
-NAME="WINBINDD"
-></A
->winbindd</H1
+NAME="WINBINDD">winbindd</H1
><DIV
CLASS="REFNAMEDIV"
><A
@@ -30,20 +29,18 @@ NAME="AEN5"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN8"
-></A
-><H2
+NAME="AEN8"><H2
>Synopsis</H2
><P
><B
CLASS="COMMAND"
>winbindd</B
-> [-i] [-B] [-d &lt;debug level&gt;] [-s &lt;smb config file&gt;] [-n]</P
+> [-F] [-S] [-i] [-B] [-d &#60;debug level&#62;] [-s &#60;smb config file&#62;] [-n]</P
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN16"
+NAME="AEN18"
></A
><H2
>DESCRIPTION</H2
@@ -171,11 +168,20 @@ CLASS="FILENAME"
> and then from the
Windows NT server. </P
><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
><PRE
CLASS="PROGRAMLISTING"
>passwd: files winbind
group: files winbind
</PRE
+></TD
+></TR
+></TABLE
></P
><P
>The following simple configuration in the
@@ -192,7 +198,7 @@ CLASS="FILENAME"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN59"
+NAME="AEN61"
></A
><H2
>OPTIONS</H2
@@ -202,6 +208,48 @@ NAME="AEN59"
CLASS="VARIABLELIST"
><DL
><DT
+>-F</DT
+><DD
+><P
+>If specified, this parameter causes
+ the main <B
+CLASS="COMMAND"
+>winbindd</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"
+>winbindd</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"
+>winbindd</B
+> to log to standard output rather
+ than a file.</P
+></DD
+><DT
>-d debuglevel</DT
><DD
><P
@@ -223,7 +271,16 @@ CLASS="COMMAND"
of <B
CLASS="COMMAND"
>winbindd</B
-> is required. </P
+> is required.
+ <B
+CLASS="COMMAND"
+>winbindd</B
+> also logs to standard output,
+ as if the <B
+CLASS="COMMAND"
+>-S</B
+> parameter had been given.
+ </P
></DD
><DT
>-n</DT
@@ -264,7 +321,7 @@ CLASS="FILENAME"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN85"
+NAME="AEN103"
></A
><H2
>NAME AND ID RESOLUTION</H2
@@ -295,7 +352,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN91"
+NAME="AEN109"
></A
><H2
>CONFIGURATION</H2
@@ -435,7 +492,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN133"
+NAME="AEN151"
></A
><H2
>EXAMPLE SETUP</H2
@@ -450,11 +507,20 @@ CLASS="FILENAME"
> put the
following:</P
><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
><PRE
CLASS="PROGRAMLISTING"
>passwd: files winbind
group: files winbind
</PRE
+></TD
+></TR
+></TABLE
></P
><P
>In <TT
@@ -468,6 +534,12 @@ CLASS="PARAMETER"
></TT
> lines with something like this: </P
><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
><PRE
CLASS="PROGRAMLISTING"
>auth required /lib/security/pam_securetty.so
@@ -475,6 +547,9 @@ auth required /lib/security/pam_nologin.so
auth sufficient /lib/security/pam_winbind.so
auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok
</PRE
+></TD
+></TR
+></TABLE
></P
><P
>Note in particular the use of the <TT
@@ -555,6 +630,12 @@ CLASS="FILENAME"
> containing directives like the
following: </P
><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
><PRE
CLASS="PROGRAMLISTING"
>[global]
@@ -568,6 +649,9 @@ CLASS="PROGRAMLISTING"
security = domain
password server = *
</PRE
+></TD
+></TR
+></TABLE
></P
><P
>Now start winbindd and you should find that your user and
@@ -586,7 +670,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN172"
+NAME="AEN190"
></A
><H2
>NOTES</H2
@@ -644,7 +728,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN188"
+NAME="AEN206"
></A
><H2
>SIGNALS</H2
@@ -695,7 +779,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN205"
+NAME="AEN223"
></A
><H2
>FILES</H2
@@ -771,7 +855,7 @@ CLASS="FILENAME"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN234"
+NAME="AEN252"
></A
><H2
>VERSION</H2
@@ -782,7 +866,7 @@ NAME="AEN234"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN237"
+NAME="AEN255"
></A
><H2
>SEE ALSO</H2
@@ -810,7 +894,7 @@ TARGET="_top"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN244"
+NAME="AEN262"
></A
><H2
>AUTHOR</H2
diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index 0b52f48c7d..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" "05 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..811bb60575 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 0aebf3276e..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" "05 November 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 6ac186cbab..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" "05 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