merging some changes from SAMBA_2_2

(This used to be commit e8ede079b5af4187573f1b8ed0d94b6f03cbbd22)

1 files changed, 25 insertions, 5 deletions

diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1
index 9537af287b..57aaf98b62 100644
--- a/docs/manpages/wbinfo.1
+++ b/docs/manpages/wbinfo.1
@@ -3,12 +3,12 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "WBINFO" "1" "28 January 2002" "" ""
+.TH "WBINFO" "1" "08 May 2002" "" ""
 .SH NAME
 wbinfo \- Query information from winbind daemon
 .SH SYNOPSIS
 .sp
-\fBwbinfo\fR [ \fB-u\fR ]  [ \fB-g\fR ]  [ \fB-n name\fR ]  [ \fB-s sid\fR ]  [ \fB-U uid\fR ]  [ \fB-G gid\fR ]  [ \fB-S sid\fR ]  [ \fB-Y sid\fR ]  [ \fB-t\fR ]  [ \fB-m\fR ]  [ \fB-a user%password\fR ]  [ \fB-p\fR ] 
+\fBwbinfo\fR [ \fB-u\fR ]  [ \fB-g\fR ]  [ \fB-h name\fR ]  [ \fB-i ip\fR ]  [ \fB-n name\fR ]  [ \fB-s sid\fR ]  [ \fB-U uid\fR ]  [ \fB-G gid\fR ]  [ \fB-S sid\fR ]  [ \fB-Y sid\fR ]  [ \fB-t\fR ]  [ \fB-m\fR ]  [ \fB-r user\fR ]  [ \fB-a user%password\fR ]  [ \fB-A user%password\fR ] 
 .SH "DESCRIPTION"
 .PP
 This tool is part of the  Sambasuite.
@@ -37,6 +37,18 @@ will also be listed. Note that this operation does not assign
 group ids to any groups that have not already been seen by
 \fBwinbindd(8)\fR. 
 .TP
+\fB-h name\fR
+The \fI-h\fR option 
+queries \fBwinbindd(8)\fR to query the WINS
+server for the IP address associated with the NetBIOS name
+specified by the \fIname\fR parameter.
+.TP
+\fB-i ip\fR
+The \fI-i\fR option 
+queries \fBwinbindd(8)\fR to send a node status
+request to get the NetBIOS name associated with the IP address
+specified by the \fIip\fR parameter.
+.TP
 \fB-n name\fR
 The \fI-n\fR option 
 queries \fBwinbindd(8)\fR for the SID 
@@ -83,13 +95,21 @@ Windows NT server \fBwinbindd(8)\fR contacts
 when resolving names. This list does not include the Windows 
 NT domain the server is a Primary Domain Controller for.
 .TP
+\fB-r username\fR
+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
 \fB-a username%password\fR
 Attempt to authenticate a user via winbindd. 
 This checks both authenticaion methods and reports its results.
 .TP
-\fB-p\fR
-Attempt a simple 'ping' check that the winbindd
-is indeed alive.
+\fB-A username%password\fR
+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).
 .SH "EXIT STATUS"
 .PP
 The wbinfo program returns 0 if the operation