The branch, master has been updated
via 06ed666... doc: Remove the documentation of the sequence command of
wbinfo.
via 790d01c... wbinfo: Document the deprecated sequence option
correctly.
from 7f8b3a2... s4-smbtorture: Fix test_SetPrinterDataEx_keys and
test_SetPrinterDataEx_values.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 06ed6667bece67de768f07f0381e551be2c742a9
Author: Andreas Schneider <[email protected]>
Date: Wed Jun 23 10:59:55 2010 +0200
doc: Remove the documentation of the sequence command of wbinfo.
The command is deprecated, see --online-status.
commit 790d01cb2e9c04d0111b7a8c952596c496e69b38
Author: Andreas Schneider <[email protected]>
Date: Wed Jun 23 10:58:37 2010 +0200
wbinfo: Document the deprecated sequence option correctly.
I didn't find a way in popt to hide it.
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/wbinfo.1.xml | 8 --------
nsswitch/wbinfo.c | 2 +-
2 files changed, 1 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/wbinfo.1.xml b/docs-xml/manpages-3/wbinfo.1.xml
index d6628e7..720715c 100644
--- a/docs-xml/manpages-3/wbinfo.1.xml
+++ b/docs-xml/manpages-3/wbinfo.1.xml
@@ -44,7 +44,6 @@
<arg choice="opt">--remove-gid-mapping gid,sid</arg>
<arg choice="opt">-s sid</arg>
<arg choice="opt">--separator</arg>
- <arg choice="opt">--sequence</arg>
<arg choice="opt">--set-auth-user user%password</arg>
<arg choice="opt">--set-uid-mapping uid,sid</arg>
<arg choice="opt">--set-gid-mapping gid,sid</arg>
@@ -125,7 +124,6 @@
operations will performed. If special domain name '.' is used
to represent
the current domain to which
<citerefentry><refentrytitle>winbindd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry> belongs. Currently
only the
- <option>--sequence</option>,
<option>-u</option>, and <option>-g</option> options honor this
parameter.
</para></listitem>
</varlistentry>
@@ -261,12 +259,6 @@
<term>--separator</term>
<listitem><para>Get the active winbind separator.
</para></listitem>
-
- </varlistentry>
- <varlistentry>
- <term>--sequence</term>
- <listitem><para>Show sequence numbers of all known domains.
- </para></listitem>
</varlistentry>
<varlistentry>
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 3c1db8b..a277ede 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -2001,7 +2001,7 @@ int main(int argc, char **argv, char **envp)
{ "trusted-domains", 'm', POPT_ARG_NONE, 0, 'm', "List trusted
domains" },
{ "all-domains", 0, POPT_ARG_NONE, 0, OPT_LIST_ALL_DOMAINS,
"List all domains (trusted and own domain)" },
{ "own-domain", 0, POPT_ARG_NONE, 0, OPT_LIST_OWN_DOMAIN, "List
own domain" },
- { "sequence", 0, POPT_ARG_NONE, 0, OPT_SEQUENCE, "Show sequence
numbers of all domains" },
+ { "sequence", 0, POPT_ARG_NONE, 0, OPT_SEQUENCE, "Deprecated
command, see --online-status" },
{ "online-status", 0, POPT_ARG_NONE, 0, OPT_ONLINESTATUS, "Show
whether domains are marked as online or offline"},
{ "domain-info", 'D', POPT_ARG_STRING, &string_arg, 'D', "Show
most of the info we have about the domain" },
{ "user-info", 'i', POPT_ARG_STRING, &string_arg, 'i', "Get
user info", "USER" },
--
Samba Shared Repository
