summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-01-11 00:41:27 +0000
committerGerald Carter <jerry@samba.org>2002-01-11 00:41:27 +0000
commit3469866334d06d089cc334e0d610577a001e33de (patch)
tree3c4562ae2717134cbf7ae7b6b9be8b813773c216
parent3fb5e2867c947de65d0c75a2ea1b9be46bbc5346 (diff)
downloadsamba-3469866334d06d089cc334e0d610577a001e33de.tar.gz
samba-3469866334d06d089cc334e0d610577a001e33de.tar.bz2
samba-3469866334d06d089cc334e0d610577a001e33de.zip
commit some changes for ab, and keep working on the smbgroupedit
manpage. (This used to be commit a10cdbfbed4e04609f511cbbf976df4b4d391729)
-rw-r--r--docs/docbook/Makefile.in2
-rw-r--r--docs/docbook/manpages/smbgroupedit.8.sgml243
-rw-r--r--docs/htmldocs/smbgroupedit.8.html325
-rw-r--r--docs/htmldocs/wbinfo.1.html30
-rw-r--r--docs/manpages/smbgroupedit.8145
-rw-r--r--docs/manpages/wbinfo.112
6 files changed, 683 insertions, 74 deletions
diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in
index 10d3802c54..ef261b3bad 100644
--- a/docs/docbook/Makefile.in
+++ b/docs/docbook/Makefile.in
@@ -52,7 +52,7 @@ SGMLMANSRC=manpages/findsmb.1.sgml manpages/smbclient.1.sgml \
manpages/smb.conf.5.sgml manpages/pdbedit.8.sgml \
manpages/wbinfo.1.sgml manpages/smbcacls.1.sgml \
manpages/smbsh.1.sgml manpages/winbindd.8.sgml \
- manpages/make_unicodemap.1.sgml manpages./smbgroupedit.8.sgml \
+ manpages/make_unicodemap.1.sgml manpages/smbgroupedit.8.sgml \
manpages/net.8.sgml
HOWTOSRC=projdoc/DOMAIN_MEMBER.sgml projdoc/NT_Security.sgml \
diff --git a/docs/docbook/manpages/smbgroupedit.8.sgml b/docs/docbook/manpages/smbgroupedit.8.sgml
index f1b5f30ddc..b9607312ff 100644
--- a/docs/docbook/manpages/smbgroupedit.8.sgml
+++ b/docs/docbook/manpages/smbgroupedit.8.sgml
@@ -7,21 +7,42 @@
</refmeta>
+<!-- ****************************************************
+** Name and Options **
+**************************************************** -->
<refnamediv>
<refname>smbgroupedit</refname>
- <refpurpose>Tool for mapping UNIX groups to Windows groups</refpurpose>
+ <refpurpose>Query/set/change UNIX - Windows NT group mapping</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>smbroupedit</command>
- <arg choice="opt">-v</arg>
+ <arg choice="opt">-v [l|s]</arg>
+ <arg choice="opt">-a UNIX-groupname [-d NT-groupname|-p prividge|</arg>
</cmdsynopsis>
</refsynopsisdiv>
+
+
+<!-- ****************************************************
+** Description **
+**************************************************** -->
<refsect1>
- <title>DESCRIPTION</title>
- <para>This program is part of the Samba suite.</para>
+
+<title>DESCRIPTION</title>
+
+<para>
+This program is part of the <ulink url="samba.7.html">Samba</ulink>
+suite.
+</para>
+
+<para>
+The smbgroupedit command allows for mapping unix groups
+to NT Builtin, Domain, or Local groups. Also
+allows setting privileges for that group, such as saAddUser,
+etc.
+</para>
</refsect1>
@@ -30,47 +51,217 @@
<variablelist>
<varlistentry>
- <term>-v</term>
- <listitem><para>Print the current set of UNIX to Windows
- group mappings.
- </para></listitem>
+ <term>-v[l|s]</term>
+ <listitem><para>This option will list all groups available
+ in the Windows NT domain in which samba is operating.
+ </para>
+
+ <variablelist>
+ <varlistentry>
+ <term>-l</term>
+ <listitem><para>give a long listing, of the format:</para>
+
+<para><programlisting>
+"NT Group Name"
+ SID :
+ Unix group :
+ Group type :
+ Comment :
+ Privilege :
+</programlisting></para>
+
+<para>For examples,</para>
+<para><programlisting>
+Users
+ SID : S-1-5-32-545
+ Unix group: -1
+ Group type: Local group
+ Comment :
+ Privilege : No privilege
+</programlisting></para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-s</term>
+ <listitem><para>display a short listing of the format:</para>
+
+<para><programlisting>
+NTGroupName(SID) -> UnixGroupName
+</programlisting></para>
+
+<para>For example,</para>
+
+<para><programlisting>
+Users (S-1-5-32-545) -> -1
+</programlisting></para>
+
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ </listitem>
</varlistentry>
</variablelist>
</refsect1>
+
+
+<!-- ****************************************************
+**************************************************** -->
<refsect1>
- <title>FILES</title>
+<title>FILES</title>
- <para></para>
+<para></para>
</refsect1>
+
+
+<!-- ****************************************************
+**************************************************** -->
<refsect1>
- <title>VERSION</title>
- <para>This man page is incomplete for version 3.0 of
- the Samba suite.</para>
+<title>EXIT STATUS</title>
+
+<para>
+<command>smbgroupedit</command> returns a status of 0 if the
+operation completed successfully, and a value of 1 in the event
+of a failure.
+</para>
+
</refsect1>
+
+
+
+<!-- ****************************************************
+**************************************************** -->
<refsect1>
- <title>SEE ALSO</title>
- <para>
- <ulink url="samba.7.html">samba(7)</ulink>
+
+<title>EXAMPLES</title>
+
+
+<para>
+To make a subset of your samba PDC users members of
+the 'Domain Admins' Global group:
+</para>
+
+<orderedlist>
+
+ <listitem><para>create a unix group (usually in
+ <filename>/etc/group</filename>), let's call it <constant>domadm</constant>.
+ </para></listitem>
+
+ <listitem><para>add to this group the users that you want to be
+ domain administrators. For example if you want joe, john and mary,
+ your entry in <filename>/etc/group</filename> will look like:
</para>
+
+ <para>domadm:x:502:joe,john,mary</para>
+ </listitem>
+
+ <listitem><para>map this domadm group to the 'domain admins' group:
+ </para>
+ <orderedlist>
+ <listitem><para>Get the SID for the Windows NT "Domain Admins"
+ group:</para>
+
+<para><programlisting>
+<prompt>root# </prompt><command>smbgroupedit -vs | grep "Domain Admins"</command>
+Domain Admins (S-1-5-21-1108995562-3116817432-1375597819-512) -> -1
+</programlisting></para>
+</listitem>
+
+ <listitem><para>map the unix domadm group to the Windows NT
+ "Domain Admins" group, by running the command:
+ </para>
+
+<para><programlisting>
+<prompt>root# </prompt><command>smbgroupedit \
+-c S-1-5-21-1108995562-3116817432-1375597819-512 \
+-u domadm</command>
+</programlisting></para>
+
+ <para>
+ <emphasis>warning:</emphasis> don't copy and paste this sample, the
+ Domain Admins SID (the S-1-5-21-...-512) is different for every PDC.
+ </para>
+ </listitem>
+ </orderedlist>
+ </listitem>
+</orderedlist>
+
+<para>
+To verify that you mapping has taken effect:
+</para>
+
+<para><programlisting>
+<prompt>root# </prompt><command>smbgroupedit -vs|grep "Domain Admins"</command>
+Domain Admins (S-1-5-21-1108995562-3116817432-1375597819-512) -> domadm
+</programlisting></para>
+
+<para>
+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:
+</para>
+
+<para><programlisting>
+<prompt>root# </prompt><command>smbgroupedit -a unixgroup -td</command>
+</programlisting></para>
+
+
+
</refsect1>
+
+
+
+<!-- ****************************************************
+**************************************************** -->
+<refsect1>
+
+<title>VERSION</title>
+
+<para>
+This man page is correct for the 3.0alpha releases of
+the Samba suite.
+</para>
+</refsect1>
+
+<!-- ****************************************************
+**************************************************** -->
+
+<refsect1>
+<title>SEE ALSO</title>
+
+<para>
+<ulink url="smb.conf.5.html">smb.conf(5)</ulink>
+</para>
+
+</refsect1>
+
+
+<!-- ****************************************************
+**************************************************** -->
+
<refsect1>
- <title>AUTHOR</title>
-
- <para>The original Samba software and related utilities
- were created by Andrew Tridgell. Samba is now developed
- by the Samba Team as an Open Source project similar
- to the way the Linux kernel is developed.</para>
-
- <para>The original Samba man pages were written by Karl Auer.
- The current set of manpages and documentation is maintained
- by the Samba Team in the same fashion as the Samba source code.</para>
+<title>AUTHOR</title>
+
+<para>
+The original Samba software and related utilities
+were created by Andrew Tridgell. Samba is now developed
+by the Samba Team as an Open Source project similar
+to the way the Linux kernel is developed.
+</para>
+
+<para>
+<command>smbgroupedit</command> was written by Jean Francois Micouleau.
+The current set of manpages and documentation is maintained
+by the Samba Team in the same fashion as the Samba source code.</para>
</refsect1>
</refentry>
diff --git a/docs/htmldocs/smbgroupedit.8.html b/docs/htmldocs/smbgroupedit.8.html
index 616067273a..4af49672ca 100644
--- a/docs/htmldocs/smbgroupedit.8.html
+++ b/docs/htmldocs/smbgroupedit.8.html
@@ -24,7 +24,7 @@ NAME="AEN5"
></A
><H2
>Name</H2
->smbgroupedit&nbsp;--&nbsp;Tool for mapping UNIX groups to Windows groups</DIV
+>smbgroupedit&nbsp;--&nbsp;Query/set/change UNIX - Windows NT group mapping</DIV
><DIV
CLASS="REFSYNOPSISDIV"
><A
@@ -36,22 +36,32 @@ NAME="AEN8"
><B
CLASS="COMMAND"
>smbroupedit</B
-> [-v]</P
+> [-v [l|s]] [-a UNIX-groupname [-d NT-groupname|-p prividge|]</P
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN12"
+NAME="AEN13"
></A
><H2
>DESCRIPTION</H2
><P
->This program is part of the Samba suite.</P
+>This program is part of the <A
+HREF="samba.7.html"
+TARGET="_top"
+>Samba</A
+>
+suite.</P
+><P
+>The smbgroupedit command allows for mapping unix groups
+to NT Builtin, Domain, or Local groups. Also
+allows setting privileges for that group, such as saAddUser,
+etc.</P
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN15"
+NAME="AEN18"
></A
><H2
>OPTIONS</H2
@@ -61,12 +71,101 @@ NAME="AEN15"
CLASS="VARIABLELIST"
><DL
><DT
->-v</DT
+>-v[l|s]</DT
><DD
><P
->Print the current set of UNIX to Windows
- group mappings.
+>This option will list all groups available
+ in the Windows NT domain in which samba is operating.
</P
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>-l</DT
+><DD
+><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"
+ SID :
+ Unix group :
+ 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
+ SID : S-1-5-32-545
+ Unix group: -1
+ Group type: Local group
+ Comment :
+ Privilege : No privilege</PRE
+></TD
+></TR
+></TABLE
+></P
+></DD
+><DT
+>-s</DT
+><DD
+><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
+></DIV
></DD
></DL
></DIV
@@ -74,7 +173,7 @@ CLASS="VARIABLELIST"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN22"
+NAME="AEN44"
></A
><H2
>FILES</H2
@@ -84,45 +183,219 @@ NAME="AEN22"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN25"
+NAME="AEN47"
+></A
+><H2
+>EXIT STATUS</H2
+><P
+><B
+CLASS="COMMAND"
+>smbgroupedit</B
+> returns a status of 0 if the
+operation completed successfully, and a value of 1 in the event
+of a failure.</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN51"
+></A
+><H2
+>EXAMPLES</H2
+><P
+>To make a subset of your samba PDC users members of
+the 'Domain Admins' Global group:</P
+><P
+></P
+><OL
+TYPE="1"
+><LI
+><P
+>create a unix group (usually in
+ <TT
+CLASS="FILENAME"
+>/etc/group</TT
+>), let's call it <TT
+CLASS="CONSTANT"
+>domadm</TT
+>.
+ </P
+></LI
+><LI
+><P
+>add to this group the users that you want to be
+ domain administrators. For example if you want joe, john and mary,
+ your entry in <TT
+CLASS="FILENAME"
+>/etc/group</TT
+> will look like:
+ </P
+><P
+>domadm:x:502:joe,john,mary</P
+></LI
+><LI
+><P
+>map this domadm group to the 'domain admins' group:
+ </P
+><P
+></P
+><OL
+TYPE="a"
+><LI
+><P
+>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
+CLASS="PROMPT"
+>root# </TT
+><B
+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
+><P
+>map the unix domadm group to the Windows NT
+ "Domain Admins" group, by running the command:
+ </P
+><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><TT
+CLASS="PROMPT"
+>root# </TT
+><B
+CLASS="COMMAND"
+>smbgroupedit \
+-c S-1-5-21-1108995562-3116817432-1375597819-512 \
+-u domadm</B
+></PRE
+></TD
+></TR
+></TABLE
+></P
+><P
+> <EM
+>warning:</EM
+> don't copy and paste this sample, the
+ Domain Admins SID (the S-1-5-21-...-512) is different for every PDC.
+ </P
+></LI
+></OL
+></LI
+></OL
+><P
+>To verify that you mapping has taken effect:</P
+><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><TT
+CLASS="PROMPT"
+>root# </TT
+><B
+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
+CLASS="PROMPT"
+>root# </TT
+><B
+CLASS="COMMAND"
+>smbgroupedit -a unixgroup -td</B
+></PRE
+></TD
+></TR
+></TABLE
+></P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN90"
></A
><H2
>VERSION</H2
><P
->This man page is incomplete for version 3.0 of
- the Samba suite.</P
+>This man page is correct for the 3.0alpha releases of
+the Samba suite.</P
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN28"
+NAME="AEN93"
></A
><H2
>SEE ALSO</H2
><P
-> <A
-HREF="samba.7.html"
+><A
+HREF="smb.conf.5.html"
TARGET="_top"
->samba(7)</A
->
- </P
+>smb.conf(5)</A
+></P
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN32"
+NAME="AEN97"
></A
><H2
>AUTHOR</H2
><P
->The original Samba software and related utilities
- were created by Andrew Tridgell. Samba is now developed
- by the Samba Team as an Open Source project similar
- to the way the Linux kernel is developed.</P
+>The original Samba software and related utilities
+were created by Andrew Tridgell. Samba is now developed
+by the Samba Team as an Open Source project similar
+to the way the Linux kernel is developed.</P
><P
->The original Samba man pages were written by Karl Auer.
- The current set of manpages and documentation is maintained
- by the Samba Team in the same fashion as the Samba source code.</P
+><B
+CLASS="COMMAND"
+>smbgroupedit</B
+> was written by Jean Francois Micouleau.
+The current set of manpages and documentation is maintained
+by the Samba Team in the same fashion as the Samba source code.</P
></DIV
></BODY
></HTML
diff --git a/docs/htmldocs/wbinfo.1.html b/docs/htmldocs/wbinfo.1.html
index badeb6961e..4cc0ef423f 100644
--- a/docs/htmldocs/wbinfo.1.html
+++ b/docs/htmldocs/wbinfo.1.html
@@ -36,12 +36,12 @@ NAME="AEN8"
><B
CLASS="COMMAND"
>wbinfo</B
-> [-u] [-g] [-n name] [-s sid] [-U uid] [-G gid] [-S sid] [-Y sid] [-t] [-m]</P
+> [-u] [-g] [-n name] [-s sid] [-U uid] [-G gid] [-S sid] [-Y sid] [-t] [-m] [-a user%password] [-p]</P
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN21"
+NAME="AEN23"
></A
><H2
>DESCRIPTION</H2
@@ -78,7 +78,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN32"
+NAME="AEN34"
></A
><H2
>OPTIONS</H2
@@ -227,13 +227,29 @@ CLASS="COMMAND"
NT domain the server is a Primary Domain Controller for.
</P
></DD
+><DT
+>-a username%password</DT
+><DD
+><P
+>Attempt to authenticate a user via winbindd.
+ This checks both authenticaion methods and reports its results.
+ </P
+></DD
+><DT
+>-p</DT
+><DD
+><P
+>Attempt a simple 'ping' check that the winbindd
+ is indeed alive.
+ </P
+></DD
></DL
></DIV
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN88"
+NAME="AEN98"
></A
><H2
>EXIT STATUS</H2
@@ -252,7 +268,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN93"
+NAME="AEN103"
></A
><H2
>VERSION</H2
@@ -263,7 +279,7 @@ NAME="AEN93"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN96"
+NAME="AEN106"
></A
><H2
>SEE ALSO</H2
@@ -281,7 +297,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN101"
+NAME="AEN111"
></A
><H2
>AUTHOR</H2
diff --git a/docs/manpages/smbgroupedit.8 b/docs/manpages/smbgroupedit.8
index aff157ca6d..05dc9f9ed4 100644
--- a/docs/manpages/smbgroupedit.8
+++ b/docs/manpages/smbgroupedit.8
@@ -3,36 +3,157 @@
.\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/>
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBGROUPEDIT" "8" "08 January 2002" "" ""
+.TH "SMBGROUPEDIT" "8" "10 January 2002" "" ""
.SH NAME
-smbgroupedit \- Tool for mapping UNIX groups to Windows groups
+smbgroupedit \- Query/set/change UNIX - Windows NT group mapping
.SH SYNOPSIS
.sp
-\fBsmbroupedit\fR [ \fB-v\fR ]
+\fBsmbroupedit\fR [ \fB-v [l|s]\fR ] [ \fB-a UNIX-groupname [-d NT-groupname|-p prividge|\fR ]
.SH "DESCRIPTION"
.PP
-This program is part of the Samba suite.
+This program is part of the Samba
+suite.
+.PP
+The smbgroupedit command allows for mapping unix groups
+to NT Builtin, Domain, or Local groups. Also
+allows setting privileges for that group, such as saAddUser,
+etc.
.SH "OPTIONS"
.TP
-\fB-v\fR
-Print the current set of UNIX to Windows
-group mappings.
+\fB-v[l|s]\fR
+This option will list all groups available
+in the Windows NT domain in which samba is operating.
+.RS
+.TP
+\fB-l\fR
+give a long listing, of the format:
+
+.sp
+.nf
+"NT Group Name"
+ SID :
+ Unix group :
+ Group type :
+ Comment :
+ Privilege :
+.sp
+.fi
+
+For examples,
+
+.sp
+.nf
+Users
+ SID : S-1-5-32-545
+ Unix group: -1
+ Group type: Local group
+ Comment :
+ Privilege : No privilege
+.sp
+.fi
+.TP
+\fB-s\fR
+display a short listing of the format:
+
+.sp
+.nf
+NTGroupName(SID) -> UnixGroupName
+.sp
+.fi
+
+For example,
+
+.sp
+.nf
+Users (S-1-5-32-545) -> -1
+.sp
+.fi
+.RE
.SH "FILES"
.PP
+.SH "EXIT STATUS"
+.PP
+\fBsmbgroupedit\fR returns a status of 0 if the
+operation completed successfully, and a value of 1 in the event
+of a failure.
+.SH "EXAMPLES"
+.PP
+To make a subset of your samba PDC users members of
+the 'Domain Admins' Global group:
+.IP 1.
+create a unix group (usually in
+\fI/etc/group\fR), let's call it domadm.
+.IP 2.
+add to this group the users that you want to be
+domain administrators. For example if you want joe, john and mary,
+your entry in \fI/etc/group\fR will look like:
+
+domadm:x:502:joe,john,mary
+.IP 3.
+map this domadm group to the 'domain admins' group:
+.RS
+.IP 1.
+Get the SID for the Windows NT "Domain Admins"
+group:
+
+.sp
+.nf
+root# \fBsmbgroupedit -vs | grep "Domain Admins"\fR
+Domain Admins (S-1-5-21-1108995562-3116817432-1375597819-512) -> -1
+.sp
+.fi
+.IP 2.
+map the unix domadm group to the Windows NT
+"Domain Admins" group, by running the command:
+
+.sp
+.nf
+root# \fBsmbgroupedit \\
+-c S-1-5-21-1108995562-3116817432-1375597819-512 \\
+-u domadm\fR
+.sp
+.fi
+
+\fBwarning:\fR don't copy and paste this sample, the
+Domain Admins SID (the S-1-5-21-...-512) is different for every PDC.
+.RE
+.PP
+To verify that you mapping has taken effect:
+.PP
+.PP
+.sp
+.nf
+root# \fBsmbgroupedit -vs|grep "Domain Admins"\fR
+Domain Admins (S-1-5-21-1108995562-3116817432-1375597819-512) -> domadm
+.sp
+.fi
+.PP
+.PP
+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:
+.PP
+.PP
+.sp
+.nf
+root# \fBsmbgroupedit -a unixgroup -td\fR
+.sp
+.fi
+.PP
.SH "VERSION"
.PP
-This man page is incomplete for version 3.0 of
+This man page is correct for the 3.0alpha releases of
the Samba suite.
.SH "SEE ALSO"
.PP
-samba(7)
+smb.conf(5)
.SH "AUTHOR"
.PP
-The original Samba software and related utilities
+The original Samba software and related utilities
were created by Andrew Tridgell. Samba is now developed
-by the Samba Team as an Open Source project similar
+by the Samba Team as an Open Source project similar
to the way the Linux kernel is developed.
.PP
-The original Samba man pages were written by Karl Auer.
+\fBsmbgroupedit\fR was written by Jean Francois Micouleau.
The current set of manpages and documentation is maintained
by the Samba Team in the same fashion as the Samba source code.
diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1
index a42a9ca31e..08353b8fd7 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" "04 January 2002" "" ""
+.TH "WBINFO" "1" "10 January 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 ]
+\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 ]
.SH "DESCRIPTION"
.PP
This tool is part of the Sambasuite.
@@ -82,6 +82,14 @@ Produce a list of domains trusted by the
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-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.
.SH "EXIT STATUS"
.PP
The wbinfo program returns 0 if the operation