updated the 3.0 branch from the head branch - ready for alpha18

(This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)

1 files changed, 41 insertions, 4 deletions

diff --git a/docs/docbook/manpages/wbinfo.1.sgml b/docs/docbook/manpages/wbinfo.1.sgml
index 7f2c4624a9..f1461b07b9 100644
--- a/docs/docbook/manpages/wbinfo.1.sgml
+++ b/docs/docbook/manpages/wbinfo.1.sgml
@@ -17,6 +17,8 @@
 		<command>wbinfo</command>
 		<arg choice="opt">-u</arg>
 		<arg choice="opt">-g</arg>
+		<arg choice="opt">-h name</arg>
+		<arg choice="opt">-i ip</arg>
 		<arg choice="opt">-n name</arg>
 		<arg choice="opt">-s sid</arg>
 		<arg choice="opt">-U uid</arg>
@@ -25,8 +27,9 @@
 		<arg choice="opt">-Y sid</arg>
 		<arg choice="opt">-t</arg>
 		<arg choice="opt">-m</arg>
+		<arg choice="opt">-r user</arg>
 		<arg choice="opt">-a user%password</arg>
-		<arg choice="opt">-p</arg>
+		<arg choice="opt">-A user%password</arg>
 	</cmdsynopsis>
 </refsynopsisdiv>
 
@@ -71,6 +74,26 @@
 		
 		
 		<varlistentry>
+		<term>-h name</term>
+		<listitem><para>The <parameter>-h</parameter> option 
+		queries <command>winbindd(8)</command> to query the WINS
+		server for the IP address associated with the NetBIOS name
+		specified by the <parameter>name</parameter> parameter.
+		</para></listitem>
+		</varlistentry>
+
+
+		<varlistentry>
+		<term>-i ip</term>
+		<listitem><para>The <parameter>-i</parameter> option 
+		queries <command>winbindd(8)</command> to send a node status
+		request to get the NetBIOS name associated with the IP address
+		specified by the <parameter>ip</parameter> parameter.
+		</para></listitem>
+		</varlistentry>
+
+
+		<varlistentry>
 		<term>-n name</term>
 		<listitem><para>The <parameter>-n</parameter> option 
 		queries <command>winbindd(8)</command> for the SID 		
@@ -143,6 +166,16 @@
 		</para></listitem>
 		</varlistentry>
 
+
+		<varlistentry>
+		<term>-r username</term>
+		<listitem><para>Try to obtain the list of UNIX group ids
+		to which the user belongs.  This only works for users
+		defined on a Domain Controller.
+		</para></listitem>
+		</varlistentry>
+
+
 		<varlistentry>
 		<term>-a username%password</term>
 		<listitem><para>Attempt to authenticate a user via winbindd. 
@@ -150,10 +183,14 @@
 		</para></listitem>
 		</varlistentry>
 
+
 		<varlistentry>
-		<term>-p</term>
-		<listitem><para>Attempt a simple 'ping' check that the winbindd
-                is indeed alive.
+		<term>-A username%password</term>
+		<listitem><para>Store username and password used by winbindd 
+		during session setup to a domain controller.  This enables
+		winbindd to operate in a Windows 2000 domain with Restrict
+		Anonymous turned on (a.k.a. Permissions compatiable with
+		Windows 2000 servers only).
 		</para></listitem>
 		</varlistentry>
 	</variablelist>