]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/samba/samba-3.5.11-docs.patch
Merge remote-tracking branch 'origin/master' into next
[ipfire-2.x.git] / src / patches / samba / samba-3.5.11-docs.patch
1 From 337e286f110f594f02ea6780900e0a95ec6794c2 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
3 Date: Fri, 5 Aug 2011 12:25:52 +0200
4 Subject: [PATCH] s3-docs: document --user-sidinfo wbinfo option.
5
6 Guenther
7 ---
8 docs-xml/manpages-3/wbinfo.1.xml | 8 ++++++++
9 1 files changed, 8 insertions(+), 0 deletions(-)
10
11 Index: samba-3.6.22/docs-xml/manpages-3/wbinfo.1.xml
12 ===================================================================
13 --- samba-3.6.22.orig/docs-xml/manpages-3/wbinfo.1.xml
14 +++ samba-3.6.22/docs-xml/manpages-3/wbinfo.1.xml
15 @@ -47,7 +47,7 @@
16 <arg choide="opt">--online-status</arg>
17 <arg choice="opt">--own-domain</arg>
18 <arg choice="opt">-p</arg>
19 - <arg choice="opt">-P|--ping-dc</arg>
20 + <arg choice="opt">--ping-dc</arg>
21 <arg choice="opt">-r user</arg>
22 <arg choide="opt">-R|--lookup-rids</arg>
23 <arg choice="opt">-s sid</arg>
24 @@ -61,6 +61,7 @@
25 <arg choice="opt">--uid-info uid</arg>
26 <arg choide="opt">--usage</arg>
27 <arg choice="opt">--user-domgroups sid</arg>
28 + <arg choice="opt">--user-sidinfo sid</arg>
29 <arg choice="opt">--user-sids sid</arg>
30 <arg choice="opt">-U uid</arg>
31 <arg choice="opt">-V</arg>
32 @@ -414,6 +415,13 @@
33 </varlistentry>
34
35 <varlistentry>
36 + <term>--user-sidinfo <replaceable>sid</replaceable></term>
37 + <listitem><para>Get user info by sid.
38 + </para></listitem>
39 + </varlistentry>
40 +
41 +
42 + <varlistentry>
43 <term>--user-sids <replaceable>sid</replaceable></term>
44 <listitem><para>Get user group SIDs for user.
45 </para></listitem>
46 Index: samba-3.6.22/docs/manpages/wbinfo.1
47 ===================================================================
48 --- samba-3.6.22.orig/docs/manpages/wbinfo.1
49 +++ samba-3.6.22/docs/manpages/wbinfo.1
50 @@ -31,7 +31,7 @@
51 wbinfo \- Query information from winbind daemon
52 .SH "SYNOPSIS"
53 .HP \w'\ 'u
54 -wbinfo [\-a\ user%password] [\-\-all\-domains] [\-\-allocate\-gid] [\-\-allocate\-uid] [\-c] [\-\-ccache\-save] [\-\-change\-user\-password] [\-D\ domain] [\-\-domain\ domain] [\-\-dsgetdcname\ domain] [\-g] [\-\-getdcname\ domain] [\-\-get\-auth\-user] [\-G\ gid] [\-\-gid\-info] [\-\-group\-info] [\-\-help|\-?] [\-i\ user] [\-I\ ip] [\-K\ user%password] [\-\-lanman] [\-m] [\-n\ name] [\-N\ netbios\-name] [\-\-ntlmv2] [\-\-online\-status] [\-\-own\-domain] [\-p] [\-P|\-\-ping\-dc] [\-r\ user] [\-R|\-\-lookup\-rids] [\-s\ sid] [\-\-separator] [\-\-set\-auth\-user\ user%password] [\-S\ sid] [\-\-sid\-aliases] [\-\-sid\-to\-fullname] [\-t] [\-u] [\-\-uid\-info\ uid] [\-\-usage] [\-\-user\-domgroups\ sid] [\-\-user\-sids\ sid] [\-U\ uid] [\-V] [\-\-verbose] [\-Y\ sid]
55 +wbinfo [\-a\ user%password] [\-\-all\-domains] [\-\-allocate\-gid] [\-\-allocate\-uid] [\-c] [\-\-ccache\-save] [\-\-change\-user\-password] [\-D\ domain] [\-\-domain\ domain] [\-\-dsgetdcname\ domain] [\-g] [\-\-getdcname\ domain] [\-\-get\-auth\-user] [\-G\ gid] [\-\-gid\-info] [\-\-group\-info] [\-\-help|\-?] [\-i\ user] [\-I\ ip] [\-K\ user%password] [\-\-lanman] [\-m] [\-n\ name] [\-N\ netbios\-name] [\-\-ntlmv2] [\-\-online\-status] [\-\-own\-domain] [\-p] [\-\-ping\-dc] [\-r\ user] [\-R|\-\-lookup\-rids] [\-s\ sid] [\-\-separator] [\-\-set\-auth\-user\ user%password] [\-S\ sid] [\-\-sid\-aliases] [\-\-sid\-to\-fullname] [\-t] [\-u] [\-\-uid\-info\ uid] [\-\-usage] [\-\-user\-domgroups\ sid] [\-\-user\-sidinfo\ sid] [\-\-user\-sids\ sid] [\-U\ uid] [\-V] [\-\-verbose] [\-Y\ sid]
56 .SH "DESCRIPTION"
57 .PP
58 This tool is part of the
59 @@ -328,6 +328,11 @@ Print brief help overview\&.
60 Get user domain groups\&.
61 .RE
62 .PP
63 +\-\-user\-sidinfo \fIsid\fR
64 +.RS 4
65 +Get user info by sid\&.
66 +.RE
67 +.PP
68 \-\-user\-sids \fIsid\fR
69 .RS 4
70 Get user group SIDs for user\&.