summaryrefslogtreecommitdiff
path: root/docs/htmldocs
diff options
context:
space:
mode:
Diffstat (limited to 'docs/htmldocs')
-rw-r--r--docs/htmldocs/nmbd.8.html69
-rw-r--r--docs/htmldocs/pdbedit.8.html144
-rw-r--r--docs/htmldocs/smbd.8.html76
-rw-r--r--docs/htmldocs/smbpasswd.8.html67
-rw-r--r--docs/htmldocs/testparm.1.html43
-rw-r--r--docs/htmldocs/wbinfo.1.html37
6 files changed, 314 insertions, 122 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
diff --git a/docs/htmldocs/pdbedit.8.html b/docs/htmldocs/pdbedit.8.html
index 3ed3dfe8e9..8cb8dc76bf 100644
--- a/docs/htmldocs/pdbedit.8.html
+++ b/docs/htmldocs/pdbedit.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
>pdbedit</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="PDBEDIT"
-></A
->pdbedit</H1
+NAME="PDBEDIT">pdbedit</H1
><DIV
CLASS="REFNAMEDIV"
><A
@@ -29,20 +28,18 @@ NAME="AEN5"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN8"
-></A
-><H2
+NAME="AEN8"><H2
>Synopsis</H2
><P
><B
CLASS="COMMAND"
>pdbedit</B
-> [-l] [-v] [-w] [-u username] [-f fullname] [-h homedir] [-d drive] [-s script] [-p profile] [-a] [-m] [-x] [-i passdb-backend] [-e passdb-backend] [-b passdb-backend] [-D debuglevel]</P
+> [-l] [-v] [-w] [-u username] [-f fullname] [-h homedir] [-D drive] [-S script] [-p profile] [-a] [-m] [-x] [-i passdb-backend] [-e passdb-backend] [-b passdb-backend] [-d debuglevel] [-s configfile] [-P account-policy] [-V value]</P
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN27"
+NAME="AEN30"
></A
><H2
>DESCRIPTION</H2
@@ -68,7 +65,7 @@ TARGET="_top"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN34"
+NAME="AEN37"
></A
><H2
>OPTIONS</H2
@@ -91,11 +88,20 @@ CLASS="COMMAND"
>pdbedit -l</B
></P
><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
><PRE
CLASS="PROGRAMLISTING"
> sorce:500:Simo Sorce
samba:45:Test User
</PRE
+></TD
+></TR
+></TABLE
></P
></DD
><DT
@@ -111,6 +117,12 @@ CLASS="COMMAND"
>pdbedit -l -v</B
></P
><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
><PRE
CLASS="PROGRAMLISTING"
> ---------------
@@ -132,6 +144,9 @@ CLASS="PROGRAMLISTING"
Logon Script:
Profile Path: \\BERSERKER\profile
</PRE
+></TD
+></TR
+></TABLE
></P
></DD
><DT
@@ -158,11 +173,20 @@ CLASS="COMMAND"
>pdbedit -l -w</B
></P
><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
><PRE
CLASS="PROGRAMLISTING"
> sorce:500:508818B733CE64BEAAD3B435B51404EE:D2A2418EFC466A8A0F6B1DBB5C3DB80C:[UX ]:LCT-00000000:
samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:BC281CE3F53B6A5146629CD4751D3490:[UX ]:LCT-3BFA1E8D:
</PRE
+></TD
+></TR
+></TABLE
></P
></DD
><DT
@@ -171,19 +195,13 @@ CLASS="PROGRAMLISTING"
><P
>This option specifies the username to be
used for the operation requested (listing, adding, removing).
- It is <SPAN
-CLASS="emphasis"
-><I
+ It is <I
CLASS="EMPHASIS"
>required</I
-></SPAN
> in add, remove and modify
- operations and <SPAN
-CLASS="emphasis"
-><I
+ operations and <I
CLASS="EMPHASIS"
>optional</I
-></SPAN
> in list
operations.</P
></DD
@@ -215,7 +233,7 @@ CLASS="COMMAND"
</P
></DD
><DT
->-d drive</DT
+>-D drive</DT
><DD
><P
>This option can be used while adding or
@@ -229,7 +247,7 @@ CLASS="COMMAND"
</P
></DD
><DT
->-s script</DT
+>-S script</DT
><DD
><P
>This option can be used while adding or
@@ -269,10 +287,19 @@ CLASS="COMMAND"
CLASS="COMMAND"
>pdbedit -a -u sorce</B
>
- <PRE
+ <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
+><PRE
CLASS="PROGRAMLISTING"
>new password:
retype new password</PRE
+></TD
+></TR
+></TABLE
>
</P
></DD
@@ -352,13 +379,78 @@ CLASS="COMMAND"
>pdbedit -b xml:/root/pdb-backup.xml -l</B
></P
></DD
+><DT
+>-P account-policy</DT
+><DD
+><P
+>Display an account policy</P
+><P
+>Valid policies are: minimum password age, reset count minutes, disconnect time,
+ user must logon to change password, password history, lockout duration, min password length,
+ maximum password age and bad lockout attempt.</P
+><P
+>Example: <B
+CLASS="COMMAND"
+>pdbedit -P "bad lockout attempt"</B
+></P
+><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+> account policy value for bad lockout attempt is 0
+ </PRE
+></TD
+></TR
+></TABLE
+></P
+></DD
+><DT
+>-V account-policy-value</DT
+><DD
+><P
+>Sets an account policy to a specified value.
+ This option may only be used in conjunction
+ with the <TT
+CLASS="PARAMETER"
+><I
+>-P</I
+></TT
+> option.
+ </P
+><P
+>Example: <B
+CLASS="COMMAND"
+>pdbedit -P "bad lockout attempt" -V 3</B
+></P
+><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+> account policy value for bad lockout attempt was 0
+ account policy value for bad lockout attempt is now 3
+ </PRE
+></TD
+></TR
+></TABLE
+></P
+></DD
></DL
></DIV
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN140"
+NAME="AEN161"
></A
><H2
>NOTES</H2
@@ -368,7 +460,7 @@ NAME="AEN140"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN143"
+NAME="AEN164"
></A
><H2
>VERSION</H2
@@ -379,7 +471,7 @@ NAME="AEN143"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN146"
+NAME="AEN167"
></A
><H2
>SEE ALSO</H2
@@ -399,7 +491,7 @@ TARGET="_top"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN151"
+NAME="AEN172"
></A
><H2
>AUTHOR</H2
diff --git a/docs/htmldocs/smbd.8.html b/docs/htmldocs/smbd.8.html
index ff0abc2bd1..65f5f95b8d 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/smbpasswd.8.html b/docs/htmldocs/smbpasswd.8.html
index fa7b4b2520..da3cb9f601 100644
--- a/docs/htmldocs/smbpasswd.8.html
+++ b/docs/htmldocs/smbpasswd.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
>smbpasswd</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="SMBPASSWD"
-></A
->smbpasswd</H1
+NAME="SMBPASSWD">smbpasswd</H1
><DIV
CLASS="REFNAMEDIV"
><A
@@ -29,20 +28,18 @@ NAME="AEN5"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN8"
-></A
-><H2
+NAME="AEN8"><H2
>Synopsis</H2
><P
><B
CLASS="COMMAND"
>smbpasswd</B
-> [-a] [-x] [-d] [-e] [-D debuglevel] [-n] [-r &lt;remote machine&gt;] [-R &lt;name resolve order&gt;] [-m] [-U username[%password]] [-h] [-s] [-w pass] [username]</P
+> [-a] [-x] [-d] [-e] [-D debuglevel] [-n] [-r &#60;remote machine&#62;] [-R &#60;name resolve order&#62;] [-m] [-U username[%password]] [-h] [-s] [-w pass] [-i] [-L] [username]</P
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN25"
+NAME="AEN27"
></A
><H2
>DESCRIPTION</H2
@@ -54,12 +51,9 @@ TARGET="_top"
> suite.</P
><P
>The smbpasswd program has several different
- functions, depending on whether it is run by the <SPAN
-CLASS="emphasis"
-><I
+ functions, depending on whether it is run by the <I
CLASS="EMPHASIS"
>root</I
-></SPAN
>
user or not. When run as a normal user it allows the user to change
the password used for their SMB sessions on any machines that store
@@ -75,12 +69,9 @@ CLASS="COMMAND"
CLASS="COMMAND"
>smbpasswd</B
> differs from how the passwd program works
- however in that it is not <SPAN
-CLASS="emphasis"
-><I
+ however in that it is not <I
CLASS="EMPHASIS"
>setuid root</I
-></SPAN
> but works in
a client-server mode and communicates with a locally running
<B
@@ -100,7 +91,7 @@ CLASS="FILENAME"
was typed correctly. No passwords will be echoed on the screen
whilst being typed. If you have a blank SMB password (specified by
the string "NO PASSWORD" in the smbpasswd file) then just press
- the &lt;Enter&gt; key when asked for your old password. </P
+ the &#60;Enter&#62; key when asked for your old password. </P
><P
>smbpasswd can also be used by a normal user to change their
SMB password on remote machines, such as Windows NT Primary Domain
@@ -119,7 +110,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN41"
+NAME="AEN43"
></A
><H2
>OPTIONS</H2
@@ -134,7 +125,7 @@ CLASS="VARIABLELIST"
><P
>This option specifies that the username
following should be added to the local smbpasswd file, with the
- new password typed (type &lt;Enter&gt; for the old password). This
+ new password typed (type &#60;Enter&#62; for the old password). This
option is ignored if the username following already exists in
the smbpasswd file and it is treated like a regular change
password command. Note that the default passdb backends require
@@ -303,12 +294,9 @@ CLASS="PARAMETER"
copy of the user account database and will not allow the password
change).</P
><P
-><SPAN
-CLASS="emphasis"
><I
CLASS="EMPHASIS"
>Note</I
-></SPAN
> that Windows 95/98 do not have
a real password database so it is not possible to change passwords
specifying a Win95/98 machine as remote machine target. </P
@@ -499,16 +487,31 @@ CLASS="PARAMETER"
</P
></DD
><DT
+>-i</DT
+><DD
+><P
+>This option tells smbpasswd that the account
+ being changed is an interdomain trust account. Currently this is used
+ when Samba is being used as an NT Primary Domain Controller.
+ The account contains the info about another trusted domain.</P
+><P
+>This option is only available when running smbpasswd as root.
+ </P
+></DD
+><DT
+>-L</DT
+><DD
+><P
+>Run in local mode.</P
+></DD
+><DT
>username</DT
><DD
><P
>This specifies the username for all of the
- <SPAN
-CLASS="emphasis"
-><I
+ <I
CLASS="EMPHASIS"
>root only</I
-></SPAN
> options to operate on. Only root
can specify this parameter as only root has the permission needed
to modify attributes directly in the local smbpasswd file.
@@ -520,7 +523,7 @@ CLASS="EMPHASIS"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN162"
+NAME="AEN173"
></A
><H2
>NOTES</H2
@@ -563,7 +566,7 @@ CLASS="FILENAME"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN172"
+NAME="AEN183"
></A
><H2
>VERSION</H2
@@ -574,7 +577,7 @@ NAME="AEN172"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN175"
+NAME="AEN186"
></A
><H2
>SEE ALSO</H2
@@ -597,7 +600,7 @@ TARGET="_top"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN181"
+NAME="AEN192"
></A
><H2
>AUTHOR</H2
diff --git a/docs/htmldocs/testparm.1.html b/docs/htmldocs/testparm.1.html
index 0fc94cd880..baf11bacac 100644
--- a/docs/htmldocs/testparm.1.html
+++ b/docs/htmldocs/testparm.1.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
>testparm</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="TESTPARM"
-></A
->testparm</H1
+NAME="TESTPARM">testparm</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"
>testparm</B
-> [-s] [-h] [-v] [-L &lt;servername&gt;] {config filename} [hostname hostIP]</P
+> [-s] [-h] [-v] [-L &#60;servername&#62;] [-t &#60;encoding&#62;] {config filename} [hostname hostIP]</P
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN17"
+NAME="AEN18"
></A
><H2
>DESCRIPTION</H2
@@ -69,12 +66,9 @@ CLASS="COMMAND"
</B
> will successfully load the configuration file.</P
><P
->Note that this is <SPAN
-CLASS="emphasis"
-><I
+>Note that this is <I
CLASS="EMPHASIS"
>NOT</I
-></SPAN
> a guarantee that
the services specified in the configuration file will be
available or will operate as expected. </P
@@ -100,7 +94,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN32"
+NAME="AEN33"
></A
><H2
>OPTIONS</H2
@@ -152,6 +146,13 @@ CLASS="FILENAME"
their defaults.</P
></DD
><DT
+>-t encoding</DT
+><DD
+><P
+> Output data in specified encoding.
+ </P
+></DD
+><DT
>configfilename</DT
><DD
><P
@@ -209,7 +210,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN72"
+NAME="AEN77"
></A
><H2
>FILES</H2
@@ -238,7 +239,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN81"
+NAME="AEN86"
></A
><H2
>DIAGNOSTICS</H2
@@ -252,18 +253,18 @@ NAME="AEN81"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN84"
+NAME="AEN89"
></A
><H2
>VERSION</H2
><P
->This man page is correct for version 2.2 of
+>This man page is correct for version 3.0 of
the Samba suite.</P
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN87"
+NAME="AEN92"
></A
><H2
>SEE ALSO</H2
@@ -289,7 +290,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN94"
+NAME="AEN99"
></A
><H2
>AUTHOR</H2
diff --git a/docs/htmldocs/wbinfo.1.html b/docs/htmldocs/wbinfo.1.html
index 26e098868e..b5cafb8829 100644
--- a/docs/htmldocs/wbinfo.1.html
+++ b/docs/htmldocs/wbinfo.1.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
>wbinfo</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="WBINFO"
-></A
->wbinfo</H1
+NAME="WBINFO">wbinfo</H1
><DIV
CLASS="REFNAMEDIV"
><A
@@ -29,20 +28,18 @@ NAME="AEN5"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN8"
-></A
-><H2
+NAME="AEN8"><H2
>Synopsis</H2
><P
><B
CLASS="COMMAND"
>wbinfo</B
-> [-u] [-g] [-h name] [-i ip] [-n name] [-s sid] [-U uid] [-G gid] [-S sid] [-Y sid] [-t] [-m] [-r user] [-a user%password] [-A user%password]</P
+> [-u] [-g] [-i ip] [-N netbios-name] [-n name] [-s sid] [-U uid] [-G gid] [-S sid] [-Y sid] [-t] [-m] [-r user] [-a user%password] [-A user%password] [-p]</P
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN26"
+NAME="AEN27"
></A
><H2
>DESCRIPTION</H2
@@ -79,7 +76,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN37"
+NAME="AEN38"
></A
><H2
>OPTIONS</H2
@@ -123,13 +120,13 @@ CLASS="COMMAND"
>. </P
></DD
><DT
->-h name</DT
+>-N name</DT
><DD
><P
>The <TT
CLASS="PARAMETER"
><I
->-h</I
+>-N</I
></TT
> option
queries <B
@@ -146,13 +143,13 @@ CLASS="PARAMETER"
</P
></DD
><DT
->-i ip</DT
+>-I ip</DT
><DD
><P
>The <TT
CLASS="PARAMETER"
><I
->-i</I
+>-I</I
></TT
> option
queries <B
@@ -308,7 +305,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN119"
+NAME="AEN120"
></A
><H2
>EXIT STATUS</H2
@@ -327,18 +324,18 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN124"
+NAME="AEN125"
></A
><H2
>VERSION</H2
><P
->This man page is correct for version 2.2 of
+>This man page is correct for version 3.0 of
the Samba suite.</P
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN127"
+NAME="AEN128"
></A
><H2
>SEE ALSO</H2
@@ -356,7 +353,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN132"
+NAME="AEN133"
></A
><H2
>AUTHOR</H2