Merge remote-tracking branch 'origin/next'

[ipfire-2.x.git] / src / patches / samba / samba-3.5.11-docs.patch

diff --git a/src/patches/samba/samba-3.5.11-docs.patch b/src/patches/samba/samba-3.5.11-docs.patch
deleted file mode 100644 (file)
index 35db3dc..0000000
--- a/src/patches/samba/samba-3.5.11-docs.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 337e286f110f594f02ea6780900e0a95ec6794c2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
-Date: Fri, 5 Aug 2011 12:25:52 +0200
-Subject: [PATCH] s3-docs: document --user-sidinfo wbinfo option.
-
-Guenther
----
- docs-xml/manpages-3/wbinfo.1.xml |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-Index: samba-3.6.22/docs-xml/manpages-3/wbinfo.1.xml
-===================================================================
---- samba-3.6.22.orig/docs-xml/manpages-3/wbinfo.1.xml
-+++ samba-3.6.22/docs-xml/manpages-3/wbinfo.1.xml
-@@ -47,7 +47,7 @@
-               <arg choide="opt">--online-status</arg>
-               <arg choice="opt">--own-domain</arg>
-               <arg choice="opt">-p</arg>
--              <arg choice="opt">-P|--ping-dc</arg>
-+              <arg choice="opt">--ping-dc</arg>
-               <arg choice="opt">-r user</arg>
-               <arg choide="opt">-R|--lookup-rids</arg>
-               <arg choice="opt">-s sid</arg>
-@@ -61,6 +61,7 @@
-               <arg choice="opt">--uid-info uid</arg>
-               <arg choide="opt">--usage</arg>
-               <arg choice="opt">--user-domgroups sid</arg>
-+              <arg choice="opt">--user-sidinfo sid</arg>
-               <arg choice="opt">--user-sids sid</arg>
-               <arg choice="opt">-U uid</arg>
-               <arg choice="opt">-V</arg>
-@@ -414,6 +415,13 @@
-               </varlistentry>
- 
-               <varlistentry>
-+              <term>--user-sidinfo <replaceable>sid</replaceable></term>
-+              <listitem><para>Get user info by sid.
-+              </para></listitem>
-+              </varlistentry>
-+
-+
-+              <varlistentry>
-               <term>--user-sids <replaceable>sid</replaceable></term>
-               <listitem><para>Get user group SIDs for user.
-               </para></listitem>
-Index: samba-3.6.22/docs/manpages/wbinfo.1
-===================================================================
---- samba-3.6.22.orig/docs/manpages/wbinfo.1
-+++ samba-3.6.22/docs/manpages/wbinfo.1
-@@ -31,7 +31,7 @@
- wbinfo \- Query information from winbind daemon
- .SH "SYNOPSIS"
- .HP \w'\ 'u
--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]
-+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]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-@@ -328,6 +328,11 @@ Print brief help overview\&.
- Get user domain groups\&.
- .RE
- .PP
-+\-\-user\-sidinfo \fIsid\fR
-+.RS 4
-+Get user info by sid\&.
-+.RE
-+.PP
- \-\-user\-sids \fIsid\fR
- .RS 4
- Get user group SIDs for user\&.