1 files changed, 65 insertions, 31 deletions
diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1
index 9bbecb29a4..6c5ca93e19 100644
--- a/docs/manpages/wbinfo.1
+++ b/docs/manpages/wbinfo.1
@@ -23,9 +23,8 @@ wbinfo \- Query information from winbind daemon
 .SH "SYNOPSIS"
 
 .nf
-\fBwbinfo\fR [-u] [-g] [-N netbios-name] [-I ip] [-n name] [-s sid] [-U uid] [-G gid]
-       [-S sid] [-Y sid] [-t] [-m] [--sequence] [-r user] [-a user%password]
-       [--set-auth-user user%password] [--get-auth-user] [-p]
+\fBwbinfo\fR [-a user%password] [-c username] [-C groupname] [--domain domain] [-I ip] [-s sid] [-u] [-U uid] [-g] [--get-auth-user] [-G gid] [-m] [-n name] [-N netbios-name] [-o user:group] [-O user:group] [-p] [-r user] [--set-auth-user user%password] [--sequence] [-S sid] [-t] [-x username] [-X groupname] [-Y sid]
+      
 .fi
 
 .SH "DESCRIPTION"
@@ -42,8 +41,23 @@ The \fBwinbindd\fR(8) daemon must be configured and running for the \fBwbinfo\fR
 .SH "OPTIONS"
 
 .TP
--u
-This option will list all users available in the Windows NT domain for which the \fBwinbindd\fR(8) daemon is operating in\&. Users in all trusted domains will also be listed\&. Note that this operation does not assign user ids to any users that have not already been seen by \fBwinbindd\fR(8) \&.
+-a username%password
+Attempt to authenticate a user via winbindd\&. This checks both authenticaion methods and reports its results\&.
+
+
+.TP
+-c user
+Create a local winbind user\&.
+
+
+.TP
+-C group
+Create a local winbindd group\&.
+
+
+.TP
+--domain name
+This parameter sets the domain on which any specified operations will performed\&. If special domain name '\&.' is used to represent the current domain to which winbindd belongs\&. Currently only the \fB--sequence\fR, \fB-u\fR, and \fB-g\fR options honor this parameter\&.
 
 
 .TP
@@ -52,8 +66,13 @@ This option will list all groups available in the Windows NT domain for which th
 
 
 .TP
--N name
-The \fI-N\fR option queries \fBwinbindd\fR(8) to query the WINS server for the IP address associated with the NetBIOS name specified by the \fIname\fR parameter\&.
+--get-auth-user
+Print username and password used by winbindd during session setup to a domain controller\&. Username and password can be set using '-A'\&. Only available for root\&.
+
+
+.TP
+-G gid
+Try to convert a UNIX group id to a Windows NT SID\&. If the gid specified does not refer to one within the idmap gid range then the operation will fail\&.
 
 
 .TP
@@ -62,43 +81,48 @@ The \fI-I\fR option queries \fBwinbindd\fR(8) to send a node status request to g
 
 
 .TP
+-m
+Produce a list of domains trusted by the Windows NT server \fBwinbindd\fR(8) contacts when resolving names\&. This list does not include the Windows NT domain the server is a Primary Domain Controller for\&.
+
+
+.TP
 -n name
 The \fI-n\fR option queries \fBwinbindd\fR(8) for the SID associated with the name specified\&. Domain names can be specified before the user name by using the winbind separator character\&. For example CWDOM1/Administrator refers to the Administrator user in the domain CWDOM1\&. If no domain is specified then the domain used is the one specified in the \fBsmb.conf\fR(5) \fIworkgroup \fR parameter\&.
 
 
 .TP
--s sid
-Use \fI-s\fR to resolve a SID to a name\&. This is the inverse of the \fI-n \fR option above\&. SIDs must be specified as ASCII strings in the traditional Microsoft format\&. For example, S-1-5-21-1455342024-3071081365-2475485837-500\&.
+-N name
+The \fI-N\fR option queries \fBwinbindd\fR(8) to query the WINS server for the IP address associated with the NetBIOS name specified by the \fIname\fR parameter\&.
 
 
 .TP
--U uid
-Try to convert a UNIX user id to a Windows NT SID\&. If the uid specified does not refer to one within the winbind uid range then the operation will fail\&.
+-o user:group
+Add a winbindd local group as a secondary group for the specified winbindd local user\&.
 
 
 .TP
--G gid
-Try to convert a UNIX group id to a Windows NT SID\&. If the gid specified does not refer to one within the winbind gid range then the operation will fail\&.
+-O user:group
+Remove a winbindd local group as a secondary group for the specified winbindd local user\&.
 
 
 .TP
--S sid
-Convert a SID to a UNIX user id\&. If the SID does not correspond to a UNIX user mapped by \fBwinbindd\fR(8) then the operation will fail\&.
+-p
+Check whether winbindd is still alive\&. Prints out either 'succeeded' or 'failed'\&.
 
 
 .TP
--Y sid
-Convert a SID to a UNIX group id\&. If the SID does not correspond to a UNIX group mapped by \fBwinbindd\fR(8) then the operation will fail\&.
+-r username
+Try to obtain the list of UNIX group ids to which the user belongs\&. This only works for users defined on a Domain Controller\&.
 
 
 .TP
--t
-Verify that the workstation trust account created when the Samba server is added to the Windows NT domain is working\&.
+-s sid
+Use \fI-s\fR to resolve a SID to a name\&. This is the inverse of the \fI-n \fR option above\&. SIDs must be specified as ASCII strings in the traditional Microsoft format\&. For example, S-1-5-21-1455342024-3071081365-2475485837-500\&.
 
 
 .TP
--m
-Produce a list of domains trusted by the Windows NT server \fBwinbindd\fR(8) contacts when resolving names\&. This list does not include the Windows NT domain the server is a Primary Domain Controller for\&.
+--set-auth-user username%password
+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)\&.
 
 
 .TP
@@ -107,28 +131,38 @@ Show sequence numbers of all known domains
 
 
 .TP
--r username
-Try to obtain the list of UNIX group ids to which the user belongs\&. This only works for users defined on a Domain Controller\&.
+-S sid
+Convert a SID to a UNIX user id\&. If the SID does not correspond to a UNIX user mapped by \fBwinbindd\fR(8) then the operation will fail\&.
 
 
 .TP
--a username%password
-Attempt to authenticate a user via winbindd\&. This checks both authenticaion methods and reports its results\&.
+-t
+Verify that the workstation trust account created when the Samba server is added to the Windows NT domain is working\&.
 
 
 .TP
---set-auth-user username%password
-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)\&.
+-u
+This option will list all users available in the Windows NT domain for which the \fBwinbindd\fR(8) daemon is operating in\&. Users in all trusted domains will also be listed\&. Note that this operation does not assign user ids to any users that have not already been seen by \fBwinbindd\fR(8) \&.
 
 
 .TP
---get-auth-user
-Print username and password used by winbindd during session setup to a domain controller\&. Username and password can be set using '-A'\&. Only available for root\&.
+-U uid
+Try to convert a UNIX user id to a Windows NT SID\&. If the uid specified does not refer to one within the idmap uid range then the operation will fail\&.
 
 
 .TP
--p
-Check whether winbindd is still alive\&. Prints out either 'succeeded' or 'failed'\&.
+-x user
+Delete an existing local winbind user\&.
+
+
+.TP
+-X group
+Delete an existing local winbindd group\&.
+
+
+.TP
+-Y sid
+Convert a SID to a UNIX group id\&. If the SID does not correspond to a UNIX group mapped by \fBwinbindd\fR(8) then the operation will fail\&.
 
 
 .TP