The branch, master has been updated
via a4c0666f6bc docs-xml: Update pdbedit manpage for new cmdline
opition parser
via aff65c0754c s3:utils: Migrate pdbedit to the new cmdline option
parser
via 95e82b5b5f8 docs-xml: Update sharesec manpage for new cmdline
opition parser
via b41a0cd199d s3:utils: Migrate sharesec to new cmdline option parser
via 4f81d8459a4 s3:utils: Remove '-V' for '--viewsddl' from sharesec
via d8b6e843fb4 s3:utils: Migrate spilt_tokens to new cmdline option
parser
via 0a6d6a28594 docs-xml: Update smbcontrol manpage for new cmdline
opition parser
via 824c355ed78 s3:utils: Migrate smbcontrol to new cmdline option
parser
via 774663094d5 s3:utils: Migrate dbwrap_torture to new cmdline option
parser
via 6bb6e0c54f8 docs-xml: Update smbstatus manpage for new cmdline
opition parser
via ee5e420dc5c s3:utils: Migrate smbstatus to new cmdline option parser
via 54f14587353 docs-xml: Update ntlm_auth manpage for new cmdline
opition parser
via c96e94fbef8 s3:utils: Migrate ntlm_auth to new cmdline option parser
via f0cd9afa8cb lib:cmdline: Add a --configfile only parser for
ntlm_auth
via c88a8a3cbea docs-xml: Update mdfind manpage for new cmdline opition
parser
via 6b4710b5f3c s3:utils: Migrate mdfind to new cmdline option parser
via 667da24bd34 docs-xml: Update testparm manpage for new cmdline
opition parser
via e63bf24d89a s3:utils: Migrate testparm to new cmdline option parser
via a5a2636e20d lib:cmdline: Add a --option only parser for testparm
via e2b2baeb549 docs-xml: Update nmblookup manpage for new cmdline
opition parser
via 4a8a77c21d4 s3:utils: Migrate nmblookup to new cmdline option parser
via 60427f5191e s3:utils: Remove duplicate '-R' option from nmblookup
via 17513416714 docs-xml: Update dbwrap_tool manpage for new cmdline
opition parser
via 8e1fe474c9b s3:utils: Migrate dbwrap_tool to new cmdline option
parser
via 00cbce7bc9b docs-xml: Update profiles manpage for new cmdline
opition parser
via 7d6608d1f91 s3:utils: Migrate profiles to new cmdline option parser
via 9d9ed421b26 docs-xml: Update smbcacls manpage
via 2d7740f65c6 docs: Update list of available commands in rpcclient
via 139cefceca2 s3:rpcclient: Document command of witness protocol
from 1d781bbff84 s3: smbd: Allow SMB1+UNIX extensions rename of dangling
symlink.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a4c0666f6bc3ccb6eedb3f5c3ff3746ae07d1c47
Author: Andreas Schneider <a...@samba.org>
Date: Mon Jan 18 16:28:28 2021 +0100
docs-xml: Update pdbedit manpage for new cmdline opition parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Autobuild-User(master): Andrew Bartlett <abart...@samba.org>
Autobuild-Date(master): Tue May 25 01:14:09 UTC 2021 on sn-devel-184
commit aff65c0754c7727e8fe9b9449ad8c2a90d715086
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 13:42:53 2021 +0100
s3:utils: Migrate pdbedit to the new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 95e82b5b5f87836ae1c6efca970d9059d1cfeca4
Author: Andreas Schneider <a...@samba.org>
Date: Mon Jan 18 15:42:39 2021 +0100
docs-xml: Update sharesec manpage for new cmdline opition parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit b41a0cd199dfc0e67664026b90ba3b5cb87e5c23
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 13:40:26 2021 +0100
s3:utils: Migrate sharesec to new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 4f81d8459a48aecf6d342045caa1531234f4f87f
Author: Andreas Schneider <a...@samba.org>
Date: Mon Jan 18 09:02:22 2021 +0100
s3:utils: Remove '-V' for '--viewsddl' from sharesec
The '-V' is already used for '-V|--version' in the common options.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit d8b6e843fb4dbb6f2e5e21015e14136f6103b677
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 13:32:24 2021 +0100
s3:utils: Migrate spilt_tokens to new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 0a6d6a28594813f40e773f0205907947b02077d2
Author: Andreas Schneider <a...@samba.org>
Date: Mon Jan 18 15:38:35 2021 +0100
docs-xml: Update smbcontrol manpage for new cmdline opition parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 824c355ed786994e0b696c446edfb86e6a79d2c1
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 13:28:11 2021 +0100
s3:utils: Migrate smbcontrol to new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 774663094d5bcbf47453fdcf69dabf1793fbcf56
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 13:22:32 2021 +0100
s3:utils: Migrate dbwrap_torture to new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 6bb6e0c54f8b34103f8a632a676ce81bd59f0583
Author: Andreas Schneider <a...@samba.org>
Date: Mon Jan 18 16:19:39 2021 +0100
docs-xml: Update smbstatus manpage for new cmdline opition parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit ee5e420dc5c56e0ce56763a3cbe52da0ae80c293
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 13:18:23 2021 +0100
s3:utils: Migrate smbstatus to new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 54f14587353a02c392a457ec4ecc1d5f3691d0a7
Author: Andreas Schneider <a...@samba.org>
Date: Mon Jan 18 16:10:03 2021 +0100
docs-xml: Update ntlm_auth manpage for new cmdline opition parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit c96e94fbef83ed2658ea08eb17cfcab19de89371
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 10:57:36 2021 +0100
s3:utils: Migrate ntlm_auth to new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit f0cd9afa8cb2444b9289f19bd05b4e8d13b9c0cc
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 10:56:41 2021 +0100
lib:cmdline: Add a --configfile only parser for ntlm_auth
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit c88a8a3cbeaab0441788763503b1aeb64e84546f
Author: Andreas Schneider <a...@samba.org>
Date: Mon Jan 18 16:02:10 2021 +0100
docs-xml: Update mdfind manpage for new cmdline opition parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 6b4710b5f3c49759d920c570cd1aba16e356f168
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 10:44:57 2021 +0100
s3:utils: Migrate mdfind to new cmdline option parser
The signing_state is correctly handled by --client-protection now!
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 667da24bd34b8a7a1b96541aa585562f468ef93b
Author: Andreas Schneider <a...@samba.org>
Date: Mon Jan 18 15:57:52 2021 +0100
docs-xml: Update testparm manpage for new cmdline opition parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit e63bf24d89ad7d5930efc3fa2ac4dc66ecad04a2
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 09:54:52 2021 +0100
s3:utils: Migrate testparm to new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit a5a2636e20d6e33327d9e06359f5512141961403
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 09:57:19 2021 +0100
lib:cmdline: Add a --option only parser for testparm
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit e2b2baeb549ee190c2c08fce65238d304c53020f
Author: Andreas Schneider <a...@samba.org>
Date: Mon Jan 18 15:50:54 2021 +0100
docs-xml: Update nmblookup manpage for new cmdline opition parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 4a8a77c21d483331a09aaca95261666a6035897e
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 09:28:34 2021 +0100
s3:utils: Migrate nmblookup to new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 60427f5191e8cb8e8dc9a5454ee5bfb523d4731d
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 09:27:07 2021 +0100
s3:utils: Remove duplicate '-R' option from nmblookup
-R is already use for 'name-resolve'. The long option --recursive is
still working and available.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 17513416714d719172c4ff5360ac96c42e1b3521
Author: Andreas Schneider <a...@samba.org>
Date: Mon Jan 18 14:10:00 2021 +0100
docs-xml: Update dbwrap_tool manpage for new cmdline opition parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 8e1fe474c9b10e64168e4d473b1203ff4ab2bb3f
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 09:16:31 2021 +0100
s3:utils: Migrate dbwrap_tool to new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 00cbce7bc9b0a88547f2c1fe2a7ab6727cfb33c5
Author: Andreas Schneider <a...@samba.org>
Date: Mon Jan 18 10:29:33 2021 +0100
docs-xml: Update profiles manpage for new cmdline opition parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 7d6608d1f9194c06de2db7e89b049a4963982aeb
Author: Andreas Schneider <a...@samba.org>
Date: Tue Jan 12 15:45:21 2021 +0100
s3:utils: Migrate profiles to new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 9d9ed421b26f733c59f9fac44e2034df704cef6a
Author: Pavel Filipenský <pfili...@redhat.com>
Date: Wed May 19 15:10:36 2021 +0200
docs-xml: Update smbcacls manpage
Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
Reviewed-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 2d7740f65c69497de665043051228f6315de4f5c
Author: Pavel Filipenský <pfili...@redhat.com>
Date: Wed May 19 13:12:31 2021 +0200
docs: Update list of available commands in rpcclient
The list of available commands in rpcclient.1 manpage is updated to
match the current state, which is visible via help commnad of rpcclient.
Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
commit 139cefceca20bd21ad557830f551eb51b343c660
Author: Pavel Filipenský <pfili...@redhat.com>
Date: Wed May 19 14:51:00 2021 +0200
s3:rpcclient: Document command of witness protocol
Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/dbwrap_tool.1.xml | 17 +-
docs-xml/manpages/mdsearch.1.xml | 35 +++-
docs-xml/manpages/nmblookup.1.xml | 37 ++--
docs-xml/manpages/ntlm_auth.1.xml | 17 +-
docs-xml/manpages/pdbedit.8.xml | 80 ++++----
docs-xml/manpages/profiles.1.xml | 20 +-
docs-xml/manpages/rpcclient.1.xml | 377 ++++++++++++++++++++++++------------
docs-xml/manpages/sharesec.1.xml | 21 +-
docs-xml/manpages/smbcacls.1.xml | 22 +++
docs-xml/manpages/smbcontrol.1.xml | 19 +-
docs-xml/manpages/smbstatus.1.xml | 47 ++---
docs-xml/manpages/testparm.1.xml | 16 +-
lib/cmdline/cmdline.c | 37 ++++
lib/cmdline/cmdline.h | 26 +++
source3/rpcclient/cmd_witness.c | 10 +-
source3/utils/dbwrap_tool.c | 29 ++-
source3/utils/dbwrap_torture.c | 27 ++-
source3/utils/mdsearch.c | 92 ++++-----
source3/utils/nmblookup.c | 41 ++--
source3/utils/ntlm_auth.c | 48 ++---
source3/utils/pdbedit.c | 30 ++-
source3/utils/profiles.c | 26 ++-
source3/utils/sharesec.c | 33 +++-
source3/utils/smbcontrol.c | 29 ++-
source3/utils/split_tokens.c | 33 ++--
source3/utils/status.c | 57 +++---
source3/utils/testparm.c | 39 +++-
source3/utils/wscript_build | 30 +--
28 files changed, 849 insertions(+), 446 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/dbwrap_tool.1.xml
b/docs-xml/manpages/dbwrap_tool.1.xml
index c2d9c306902..c6a69f89ba1 100644
--- a/docs-xml/manpages/dbwrap_tool.1.xml
+++ b/docs-xml/manpages/dbwrap_tool.1.xml
@@ -19,13 +19,17 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>dbwrap_tool</command>
+ <arg choice="opt">-?|--help</arg>
+ <arg choice="opt">--usage</arg>
<arg choice="opt">--persistent</arg>
<arg choice="opt">--non-persistent</arg>
- <arg choice="opt">-d <debug level></arg>
- <arg choice="opt">-s <config file></arg>
- <arg choice="opt">-l <log file base></arg>
- <arg choice="opt">-V</arg>
- <arg choice="opt">--option=<name>=<value></arg>
+ <arg choice="opt">-d|--debuglevel=DEBUGLEVEL</arg>
+ <arg choice="opt">--debug-stdout</arg>
+ <arg choice="opt">--configfile=CONFIGFILE</arg>
+ <arg choice="opt">--option=name=value</arg>
+ <arg choice="opt">-l|--log-basename=LOGFILEBASE</arg>
+ <arg choice="opt">--leak-report</arg>
+ <arg choice="opt">--leak-report-full</arg>
<arg choice="req"><database></arg>
<arg choice="req"><operation></arg>
<arg choice="opt"><key>
@@ -90,8 +94,9 @@
specified.
</para></listitem>
</varlistentry>
- &popt.common.samba.client;
+
&popt.autohelp;
+ &cmdline.common.samba.client;
</variablelist>
</refsect1>
diff --git a/docs-xml/manpages/mdsearch.1.xml b/docs-xml/manpages/mdsearch.1.xml
index c75d1f045f0..14bc825feac 100644
--- a/docs-xml/manpages/mdsearch.1.xml
+++ b/docs-xml/manpages/mdsearch.1.xml
@@ -17,12 +17,40 @@
<refsynopsisdiv>
<cmdsynopsis>
- <command>mvxattr</command>
+ <command>mdfine</command>
<arg choice="req">server</arg>
<arg choice="req">sharename</arg>
<arg choice="req">query</arg>
- <arg choice="opt">-p, --path</arg>
+ <arg choice="opt">-p, --path=STRING</arg>
<arg choice="opt">-L, --live</arg>
+ <arg choice="opt">-?|--help</arg>
+ <arg choice="opt">--usage</arg>
+ <arg choice="opt">-d|--debuglevel=DEBUGLEVEL</arg>
+ <arg choice="opt">--debug-stdout</arg>
+ <arg choice="opt">--configfile=CONFIGFILE</arg>
+ <arg choice="opt">--option=name=value</arg>
+ <arg choice="opt">-l|--log-basename=LOGFILEBASE</arg>
+ <arg choice="opt">--leak-report</arg>
+ <arg choice="opt">--leak-report-full</arg>
+ <arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
+ <arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
+ <arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
+ <arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
+ <arg choice="opt">--netbios-scope=SCOPE</arg>
+ <arg choice="opt">-W|--workgroup=WORKGROUP</arg>
+ <arg choice="opt">--realm=REALM</arg>
+ <arg choice="opt">-U|--user=[DOMAIN/]USERNAME[%PASSWORD]</arg>
+ <arg choice="opt">-N|--no-pass</arg>
+ <arg choice="opt">--password=STRING</arg>
+ <arg choice="opt">--pw-nt-hash</arg>
+ <arg choice="opt">-A|--authentication-file=FILE</arg>
+ <arg choice="opt">-P|--machine-pass</arg>
+ <arg choice="opt">--simple-bind-dn=DN</arg>
+ <arg choice="opt">--use-kerberos=desired|required|off</arg>
+ <arg choice="opt">--use-krb5-ccache=CCACHE</arg>
+ <arg choice="opt">--use-winbind-ccache</arg>
+ <arg choice="opt">--client-protection=sign|encrypt|off</arg>
+ <arg choice="opt">-V|--version</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -84,6 +112,9 @@
<listitem><para>Query remains running.</para></listitem>
</varlistentry>
+ &popt.autohelp;
+ &cmdline.common.samba.client;
+ &cmdline.common.credentials;
</variablelist>
</refsect1>
diff --git a/docs-xml/manpages/nmblookup.1.xml
b/docs-xml/manpages/nmblookup.1.xml
index c633e072146..9ac602cbd59 100644
--- a/docs-xml/manpages/nmblookup.1.xml
+++ b/docs-xml/manpages/nmblookup.1.xml
@@ -21,17 +21,30 @@
<cmdsynopsis>
<command>nmblookup</command>
<arg choice="opt">-M|--master-browser</arg>
- <arg choice="opt">-R|--recursion</arg>
+ <arg choice="opt">--recursion</arg>
<arg choice="opt">-S|--status</arg>
<arg choice="opt">-r|--root-port</arg>
<arg choice="opt">-A|--lookup-by-ip</arg>
- <arg choice="opt">-B|--broadcast <broadcast address></arg>
- <arg choice="opt">-U|--unicast <unicast address></arg>
- <arg choice="opt">-d <debug level></arg>
- <arg choice="opt">-s <smb config file></arg>
- <arg choice="opt">-i <NetBIOS scope></arg>
+ <arg choice="opt">-B|--broadcast=BROADCAST-ADDRESS</arg>
+ <arg choice="opt">-U|--unicast=UNICAST-ADDRESS</arg>
<arg choice="opt">-T|--translate</arg>
<arg choice="opt">-f|--flags</arg>
+ <arg choice="opt">-?|--help</arg>
+ <arg choice="opt">--usage</arg>
+ <arg choice="opt">-d|--debuglevel=DEBUGLEVEL</arg>
+ <arg choice="opt">--debug-stdout</arg>
+ <arg choice="opt">--configfile=CONFIGFILE</arg>
+ <arg choice="opt">--option=name=value</arg>
+ <arg choice="opt">-l|--log-basename=LOGFILEBASE</arg>
+ <arg choice="opt">--leak-report</arg>
+ <arg choice="opt">--leak-report-full</arg>
+ <arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
+ <arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
+ <arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
+ <arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
+ <arg choice="opt">--netbios-scope=SCOPE</arg>
+ <arg choice="opt">-W|--workgroup=WORKGROUP</arg>
+ <arg choice="opt">--realm=REALM</arg>
<arg choice="req">name</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -66,7 +79,7 @@
</varlistentry>
<varlistentry>
- <term>-R|--recursion</term>
+ <term>--recursion</term>
<listitem><para>Set the recursion desired bit in the packet
to do a recursive lookup. This is used when sending a name
query to a machine running a WINS server and the user wishes
@@ -107,9 +120,6 @@
- &popt.common.connection;
- &popt.autohelp;
-
<varlistentry>
<term>-B|--broadcast <broadcast address></term>
<listitem><para>Send the query to the given broadcast address.
Without
@@ -131,9 +141,6 @@
(along with the <parameter>-R</parameter> option) is needed to
query a WINS server.</para></listitem>
</varlistentry>
-
- &stdarg.server.debug;
- &popt.common.samba;
<varlistentry>
<term>-T|--translate</term>
@@ -165,6 +172,10 @@
'*', which will return all registered names within a broadcast
area.</para></listitem>
</varlistentry>
+
+ &cmdline.common.samba.client;
+ &cmdline.common.connection;
+ &popt.autohelp;
</variablelist>
</refsect1>
diff --git a/docs-xml/manpages/ntlm_auth.1.xml
b/docs-xml/manpages/ntlm_auth.1.xml
index 554522438ab..c257d1d617a 100644
--- a/docs-xml/manpages/ntlm_auth.1.xml
+++ b/docs-xml/manpages/ntlm_auth.1.xml
@@ -391,20 +391,11 @@
</para></listitem>
</varlistentry>
- <varlistentry>
- <term>--configfile=<configuration file></term>
- <listitem><para>The file specified contains the
- configuration details required by the server. The
- information in this file includes server-specific
- information such as what printcap file to use, as well
- as descriptions of all the services that the server is
- to provide. See &smb.conf; for more information.
- The default configuration file name is determined at
- compile time.</para></listitem>
- </varlistentry>
-
- &stdarg.version;
&popt.autohelp;
+ &cmdline.common.debug.client;
+ &cmdline.common.config.client;
+ &cmdline.common.option;
+ &cmdline.version;
</variablelist>
</refsect1>
diff --git a/docs-xml/manpages/pdbedit.8.xml b/docs-xml/manpages/pdbedit.8.xml
index 1cabc0ba3d0..5849498b98f 100644
--- a/docs-xml/manpages/pdbedit.8.xml
+++ b/docs-xml/manpages/pdbedit.8.xml
@@ -19,42 +19,48 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>pdbedit</command>
- <arg choice="opt">-a</arg>
- <arg choice="opt">-b passdb-backend</arg>
- <arg choice="opt">-c account-control</arg>
- <arg choice="opt">-C value</arg>
- <arg choice="opt">-d debuglevel</arg>
- <arg choice="opt">-D drive</arg>
- <arg choice="opt">-e passdb-backend</arg>
- <arg choice="opt">-f fullname</arg>
- <arg choice="opt">--force-initialized-passwords</arg>
- <arg choice="opt">-g</arg>
- <arg choice="opt">-h homedir</arg>
- <arg choice="opt">-i passdb-backend</arg>
- <arg choice="opt">-I domain</arg>
- <arg choice="opt">-K</arg>
- <arg choice="opt">-L </arg>
- <arg choice="opt">-m</arg>
- <arg choice="opt">-M SID|RID</arg>
- <arg choice="opt">-N description</arg>
- <arg choice="opt">-P account-policy</arg>
- <arg choice="opt">-p profile</arg>
+ <arg choice="opt">-L|--list</arg>
+ <arg choice="opt">-v|--verbose</arg>
+ <arg choice="opt">-w|--smbpasswd-style</arg>
+ <arg choice="opt">-u|--user=USER</arg>
+ <arg choice="opt">-N|--account-desc=STRING</arg>
+ <arg choice="opt">-f|--fullname=STRING</arg>
+ <arg choice="opt">-h|--homedir=STRING</arg>
+ <arg choice="opt">-D|--drive=STRING</arg>
+ <arg choice="opt">-S|--script=STRING</arg>
+ <arg choice="opt">-p|--profile=STRING</arg>
+ <arg choice="opt">-I|--domain=STRING</arg>
+ <arg choice="opt">-U|--user SID=STRING</arg>
+ <arg choice="opt">-M|--machine SID=STRING</arg>
+ <arg choice="opt">-a|--create</arg>
+ <arg choice="opt">-r|--modify</arg>
+ <arg choice="opt">-m|--machine</arg>
+ <arg choice="opt">-x|--delete</arg>
+ <arg choice="opt">-b|--backend=STRING</arg>
+ <arg choice="opt">-i|--import=STRING</arg>
+ <arg choice="opt">-e|--export=STRING</arg>
+ <arg choice="opt">-g|--group</arg>
+ <arg choice="opt">-y|--policies</arg>
<arg choice="opt">--policies-reset</arg>
- <arg choice="opt">-r</arg>
- <arg choice="opt">-s configfile</arg>
- <arg choice="opt">-S script</arg>
- <arg choice="opt">--set-nt-hash</arg>
- <arg choice="opt">-t</arg>
- <arg choice="opt">--time-format</arg>
- <arg choice="opt">-u username</arg>
- <arg choice="opt">-U SID|RID</arg>
- <arg choice="opt">-v</arg>
- <arg choice="opt">-V</arg>
- <arg choice="opt">-w</arg>
- <arg choice="opt">-x</arg>
- <arg choice="opt">-y</arg>
- <arg choice="opt">-z</arg>
- <arg choice="opt">-Z</arg>
+ <arg choice="opt">-P|--account-policy=STRING</arg>
+ <arg choice="opt">-C|--value=LONG</arg>
+ <arg choice="opt">-c|--account-control=STRING</arg>
+ <arg choice="opt">--force-initialized-passwords</arg>
+ <arg choice="opt">-z|--bad-password-count-reset</arg>
+ <arg choice="opt">-Z|--logon-hours-reset</arg>
+ <arg choice="opt">--time-format=STRING</arg>
+ <arg choice="opt">-t|--password-from-stdin</arg>
+ <arg choice="opt">-K|--kickoff-time=STRING</arg>
+ <arg choice="opt">--set-nt-hash=STRING</arg>
+ <arg choice="opt">-?|--help</arg>
+ <arg choice="opt">--usage</arg>
+ <arg choice="opt">-d|--debuglevel=DEBUGLEVEL</arg>
+ <arg choice="opt">--debug-stdout</arg>
+ <arg choice="opt">--configfile=CONFIGFILE</arg>
+ <arg choice="opt">--option=name=value</arg>
+ <arg choice="opt">-l|--log-basename=LOGFILEBASE</arg>
+ <arg choice="opt">--leak-report</arg>
+ <arg choice="opt">--leak-report-full</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -520,9 +526,7 @@ account policy value for bad lockout attempt is now 3
</varlistentry>
&popt.autohelp;
- &stdarg.server.debug;
- &popt.common.samba;
-
+ &cmdline.common.samba.client;
</variablelist>
</refsect1>
diff --git a/docs-xml/manpages/profiles.1.xml b/docs-xml/manpages/profiles.1.xml
index 012f84354b6..9d57a7d61d2 100644
--- a/docs-xml/manpages/profiles.1.xml
+++ b/docs-xml/manpages/profiles.1.xml
@@ -20,10 +20,19 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>profiles</command>
- <arg choice="opt">-v</arg>
- <arg choice="opt">-c|--change-sid SID</arg>
- <arg choice="opt">-n|--new-sid SID</arg>
- <arg choice="req">file</arg>
+ <arg choice="opt">-c|--change-sid=STRING</arg>
+ <arg choice="opt">-n|--new-sid=STRING</arg>
+ <arg choice="opt">-v|--verbose</arg>
+ <arg choice="opt">-?|--help</arg>
+ <arg choice="opt">--usage</arg>
+ <arg choice="opt">-d|--debuglevel=DEBUGLEVEL</arg>
+ <arg choice="opt">--debug-stdout</arg>
+ <arg choice="opt">--configfile=CONFIGFILE</arg>
+ <arg choice="opt">--option=name=value</arg>
+ <arg choice="opt">-l|--log-basename=LOGFILEBASE</arg>
+ <arg choice="opt">--leak-report</arg>
+ <arg choice="opt">--leak-report-full</arg>
+ <arg choice="req">FILE</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -63,9 +72,8 @@
</para></listitem>
</varlistentry>
- &popt.common.samba.client;
+ &cmdline.common.samba.client;
&popt.autohelp;
-
</variablelist>
</refsect1>
diff --git a/docs-xml/manpages/rpcclient.1.xml
b/docs-xml/manpages/rpcclient.1.xml
index 5ea4f51b0cd..16fbe9207e4 100644
--- a/docs-xml/manpages/rpcclient.1.xml
+++ b/docs-xml/manpages/rpcclient.1.xml
@@ -188,75 +188,76 @@
<refsect2>
<title>LSARPC</title>
-
<variablelist>
<varlistentry><term>lsaquery</term><listitem><para>Query info
policy</para></listitem></varlistentry>
-
- <varlistentry><term>lookupsids</term><listitem><para>Resolve a
list
- of SIDs to usernames.
- </para></listitem></varlistentry>
-
- <varlistentry><term>lookupnames</term><listitem><para>Resolve a
list
- of usernames to SIDs.
- </para></listitem></varlistentry>
-
+ <varlistentry><term>lookupsids</term><listitem><para>Convert
SIDs to names</para></listitem></varlistentry>
+ <varlistentry><term>lookupsids3</term><listitem><para>Convert
SIDs to names</para></listitem></varlistentry>
+
<varlistentry><term>lookupsids_level</term><listitem><para>Convert SIDs to
names</para></listitem></varlistentry>
+ <varlistentry><term>lookupnames</term><listitem><para>Convert
names to SIDs</para></listitem></varlistentry>
+ <varlistentry><term>lookupnames4</term><listitem><para>Convert
names to SIDs</para></listitem></varlistentry>
+
<varlistentry><term>lookupnames_level</term><listitem><para>Convert names to
SIDs</para></listitem></varlistentry>
<varlistentry><term>enumtrust</term><listitem><para>Enumerate
trusted domains</para></listitem></varlistentry>
-
<varlistentry><term>enumprivs</term><listitem><para>Enumerate
privileges</para></listitem></varlistentry>
-
<varlistentry><term>getdispname</term><listitem><para>Get the
privilege name</para></listitem></varlistentry>
-
<varlistentry><term>lsaenumsid</term><listitem><para>Enumerate
the LSA SIDS</para></listitem></varlistentry>
-
+
<varlistentry><term>lsacreateaccount</term><listitem><para>Create a new lsa
account</para></listitem></varlistentry>
<varlistentry><term>lsaenumprivsaccount</term><listitem><para>Enumerate the
privileges of an SID</para></listitem></varlistentry>
-
<varlistentry><term>lsaenumacctrights</term><listitem><para>Enumerate the
rights of an SID</para></listitem></varlistentry>
-
-
<varlistentry><term>lsaenumacctwithright</term><listitem><para>Enumerate
accounts with a right</para></listitem></varlistentry>
-
+ <varlistentry><term>lsaaddpriv</term><listitem><para>Assign a
privilege to a SID</para></listitem></varlistentry>
+ <varlistentry><term>lsadelpriv</term><listitem><para>Revoke a
privilege from a SID</para></listitem></varlistentry>
<varlistentry><term>lsaaddacctrights</term><listitem><para>Add
rights to an account</para></listitem></varlistentry>
-
<varlistentry><term>lsaremoveacctrights</term><listitem><para>Remove rights
from an account</para></listitem></varlistentry>
-
<varlistentry><term>lsalookupprivvalue</term><listitem><para>Get a privilege
value given its name</para></listitem></varlistentry>
-
<varlistentry><term>lsaquerysecobj</term><listitem><para>Query
LSA security object</para></listitem></varlistentry>
-
- </variablelist>
+
<varlistentry><term>lsaquerytrustdominfo</term><listitem><para>Query LSA
trusted domains info (given a SID)</para></listitem></varlistentry>
+
<varlistentry><term>lsaquerytrustdominfobyname</term><listitem><para>Query LSA
trusted domains info (given a name), only works for Windows >
2k</para></listitem></varlistentry>
+
<varlistentry><term>lsaquerytrustdominfobysid</term><listitem><para>Query LSA
trusted domains info (given a SID)</para></listitem></varlistentry>
+
<varlistentry><term>lsasettrustdominfo</term><listitem><para>Set LSA trusted
domain info</para></listitem></varlistentry>
+ <varlistentry><term>getusername</term><listitem><para>Get
username</para></listitem></varlistentry>
+ <varlistentry><term>createsecret</term><listitem><para>Create
Secret</para></listitem></varlistentry>
+ <varlistentry><term>deletesecret</term><listitem><para>Delete
Secret</para></listitem></varlistentry>
+ <varlistentry><term>querysecret</term><listitem><para>Query
Secret</para></listitem></varlistentry>
+ <varlistentry><term>setsecret</term><listitem><para>Set
Secret</para></listitem></varlistentry>
+
<varlistentry><term>retrieveprivatedata</term><listitem><para>Retrieve Private
Data</para></listitem></varlistentry>
+
<varlistentry><term>storeprivatedata</term><listitem><para>Store Private
Data</para></listitem></varlistentry>
+ <varlistentry><term>createtrustdom</term><listitem><para>Create
Trusted Domain</para></listitem></varlistentry>
+ <varlistentry><term>deletetrustdom</term><listitem><para>Delete
Trusted Domain</para></listitem></varlistentry>
+ </variablelist>
</refsect2>
-
+
+
<refsect2>
<title>LSARPC-DS</title>
-
<variablelist>
<varlistentry><term>dsroledominfo</term><listitem><para>Get
Primary Domain Information</para></listitem></varlistentry>
</variablelist>
+ </refsect2>
- <para> </para>
- <para><emphasis>DFS</emphasis></para>
+ <refsect2>
+ <title>DFS</title>
<variablelist>
- <varlistentry><term>dfsexist</term><listitem><para>Query DFS
support</para></listitem></varlistentry>
+ <varlistentry><term>dfsversion</term><listitem><para>Query DFS
support</para></listitem></varlistentry>
<varlistentry><term>dfsadd</term><listitem><para>Add a DFS
share</para></listitem></varlistentry>
<varlistentry><term>dfsremove</term><listitem><para>Remove a
DFS share</para></listitem></varlistentry>
<varlistentry><term>dfsgetinfo</term><listitem><para>Query DFS
share info</para></listitem></varlistentry>
<varlistentry><term>dfsenum</term><listitem><para>Enumerate dfs
shares</para></listitem></varlistentry>
+ <varlistentry><term>dfsenumex</term><listitem><para>Enumerate
dfs shares</para></listitem></varlistentry>
</variablelist>
-
</refsect2>
+
<refsect2>
- <title>REG</title>
+ <title>SHUTDOWN</title>
<variablelist>
- <varlistentry><term>shutdown</term><listitem><para>Remote
Shutdown</para></listitem></varlistentry>
- <varlistentry><term>abortshutdown</term><listitem><para>Abort
Shutdown</para></listitem></varlistentry>
+ <varlistentry><term>shutdowninit</term><listitem><para>syntax:
shutdown [-m message] </para></listitem></varlistentry>
+ <varlistentry><term>shutdownabort</term><listitem><para>syntax:
shutdownabort</para></listitem></varlistentry>
</variablelist>
-
</refsect2>
+
<refsect2>
<title>SRVSVC</title>
-
<variablelist>
<varlistentry><term>srvinfo</term><listitem><para>Server query
info</para></listitem></varlistentry>
<varlistentry><term>netshareenum</term><listitem><para>Enumerate
shares</para></listitem></varlistentry>
@@ -275,34 +276,49 @@
<varlistentry><term>netshareadd</term><listitem><para>Add
share</para></listitem></varlistentry>
<varlistentry><term>netsharedel</term><listitem><para>Delete
share</para></listitem></varlistentry>
</variablelist>
-
</refsect2>
+
<refsect2>
<title>SAMR</title>
-
<variablelist>
<varlistentry><term>queryuser</term><listitem><para>Query user
info</para></listitem></varlistentry>
<varlistentry><term>querygroup</term><listitem><para>Query
group info</para></listitem></varlistentry>
<varlistentry><term>queryusergroups</term><listitem><para>Query
user groups</para></listitem></varlistentry>
+
<varlistentry><term>queryuseraliases</term><listitem><para>Query user
aliases</para></listitem></varlistentry>
<varlistentry><term>querygroupmem</term><listitem><para>Query
group membership</para></listitem></varlistentry>
<varlistentry><term>queryaliasmem</term><listitem><para>Query
alias membership</para></listitem></varlistentry>
+ <varlistentry><term>queryaliasinfo</term><listitem><para>Query
alias info</para></listitem></varlistentry>
+ <varlistentry><term>deletealias</term><listitem><para>Delete an
alias</para></listitem></varlistentry>
<varlistentry><term>querydispinfo</term><listitem><para>Query
display info</para></listitem></varlistentry>
+ <varlistentry><term>querydispinfo2</term><listitem><para>Query
display info</para></listitem></varlistentry>
+ <varlistentry><term>querydispinfo3</term><listitem><para>Query
display info</para></listitem></varlistentry>
<varlistentry><term>querydominfo</term><listitem><para>Query
domain info</para></listitem></varlistentry>
<varlistentry><term>enumdomusers</term><listitem><para>Enumerate domain
users</para></listitem></varlistentry>
<varlistentry><term>enumdomgroups</term><listitem><para>Enumerate domain
groups</para></listitem></varlistentry>
<varlistentry><term>enumalsgroups</term><listitem><para>Enumerate alias
groups</para></listitem></varlistentry>
+ <varlistentry><term>enumdomains</term><listitem><para>Enumerate
domains</para></listitem></varlistentry>
<varlistentry><term>createdomuser</term><listitem><para>Create
domain user</para></listitem></varlistentry>
+ <varlistentry><term>createdomgroup</term><listitem><para>Create
domain group</para></listitem></varlistentry>
+ <varlistentry><term>createdomalias</term><listitem><para>Create
domain alias</para></listitem></varlistentry>
<varlistentry><term>samlookupnames</term><listitem><para>Look
up names</para></listitem></varlistentry>
<varlistentry><term>samlookuprids</term><listitem><para>Look up
names</para></listitem></varlistentry>
+ <varlistentry><term>deletedomgroup</term><listitem><para>Delete
domain group</para></listitem></varlistentry>
<varlistentry><term>deletedomuser</term><listitem><para>Delete
domain user</para></listitem></varlistentry>
<varlistentry><term>samquerysecobj</term><listitem><para>Query
SAMR security object</para></listitem></varlistentry>
<varlistentry><term>getdompwinfo</term><listitem><para>Retrieve
domain password info</para></listitem></varlistentry>
- <varlistentry><term>lookupdomain</term><listitem><para>Look up
domain</para></listitem></varlistentry>
+
<varlistentry><term>getusrdompwinfo</term><listitem><para>Retrieve user domain
password info</para></listitem></varlistentry>
+ <varlistentry><term>lookupdomain</term><listitem><para>Lookup
Domain Name</para></listitem></varlistentry>
+ <varlistentry><term>chgpasswd</term><listitem><para>Change user
password</para></listitem></varlistentry>
+ <varlistentry><term>chgpasswd2</term><listitem><para>Change
user password</para></listitem></varlistentry>
--
Samba Shared Repository
