The branch, master has been updated
via f753e2f7acf s3:lib: Remove util_cmdline
via c377845d27d s3:lib: Remove popt_samba3
via c90b3db95a9 s3:printing: Migrate samba-bgqd to new cmdline option
parser
via 84b5440eb4f s3:libsmb: Use cli_credentials to store traversal creds
via 1796737eaee docs-xml: Update net manpage for new cmdline opition
parser
via ea071d278a6 s3:utils: Use connection and credentials parser in net
util
via 91d20d1d111 s3:utils: Add cli_credentials and loadparm_context to
net_context
via 6fe55b2f261 s3:utils: Migrate net to new cmdline option parser
via 94fc9ca4c50 s3:utils: Remove '-l' for '--long' from net
via f2b80723d38 examples: Migrate smb2mount to new cmdline option parser
via 06a1861ca86 examples: Pass cli_credentials to connect_one in
smb2mount
via 8b01db48f43 docs-xml: Update smbtree manpage for new cmdline
opition parser
via e8ba85b4a80 s3:utils: Migrate smbtree to new cmdline option parser
via 5faa0cc81f3 docs-xml: Update smbcquotas manpage for new cmdline
opition parser
via 7b0b9826c28 s3:utils: Migrate smbcquotas to the new cmdline option
parser
via 9fccbfd5d95 s3:utils: Rename --user to --quota-user in smbcquotas
via fb89a5f38e1 s3:utils: Use samba_cmdline_burn() in smbget
via c31d9fa8f5e docs-xml: Update samba-regedit manpage for new cmdline
opition parser
via b58dc5056e8 s3:utils: Migrate samba-regedit to new cmdline option
parser
via 57434b1484a docs-xml: Update smbcacls manpage for new cmdline
opition parser
via e652f542e07 s3:utils: Migrate smbcacls to new cmdline option parser
via 83eea54ff6e s3:utils: Use cli_credentials in 'struct
cacl_callback_state'
via 1280531a73d s3:utils: Pass cli_credentials to connect_one()
from e9a804c9bdb s3:param:py_param - allocate buffer for nt_name and
comment
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f753e2f7acf8f3394a5f1107344d0323acc05694
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 16:14:31 2021 +0100
s3:lib: Remove util_cmdline
_ /)
mo / )
|/)\)
/\_
\__|=
( )
__)(__
_____/ \\_____
| _ ___ _ ||
| | \ | | \ ||
| | | | | | ||
| |_/ | |_/ ||
| | \ | | ||
| | \ | | ||
| | \. _|_. | . ||
| ||
| 1992 - 2021 ||
| ||
* | * ** * ** |** **
\))ejm97/.,(//,,..,,\||(,,.,\\,.((//
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): Fri May 28 03:41:52 UTC 2021 on sn-devel-184
commit c377845d27d4dcd7c1791e8b2b42b0f21c9d8bf3
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 15:01:56 2021 +0100
s3:lib: Remove popt_samba3
_|_
|
.-'''''-.
.-' '-.
.-' :::::_::::: '-.
___/ ==:...:::-:::...:== \___
/_____________________________\
':'-._________________________.-'_
':::\ @-,`-[-][-^-][-]-`,-@ / _| |_
'::| .-------------------. ||_ @ _|
::|=|* ___ _ ___ *|=|'.| |
':| |' ))_) )) ))_) '| |::.^|
_:|=|' ((`\ (( (( '|=|::::::.
_| || |' _ '| |:::::::.
|_ |=|'2003 _( )_ 2021'|=|':::::.
| || |' ( (_ ~ _) ) '| | ':::'
|^||=|* ) (_) ( *|=| '::'
| '-------------------' .::::'
|_____________________.::::::'
.'___________________.::::::''
|_______________.::::'':::'''
.'_____________.::::::''::::''
.:::'''' .'::::'
.:::::''':. .:::::'
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit c90b3db95a9ae43327d8e2f09d39b27505c38f7c
Author: Andreas Schneider <a...@samba.org>
Date: Tue May 25 09:36:48 2021 +0200
s3:printing: Migrate samba-bgqd to new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 84b5440eb4f3c10e2729e916d097f5af07150dcd
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 16:11:17 2021 +0100
s3:libsmb: Use cli_credentials to store traversal creds
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 1796737eaee9d2e16bb034ce50c095a9546232f2
Author: Andreas Schneider <a...@samba.org>
Date: Tue Jan 19 07:42:08 2021 +0100
docs-xml: Update net manpage for new cmdline opition parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit ea071d278a614f17b5417d3ff98e1b8d1fd8970d
Author: Andreas Schneider <a...@samba.org>
Date: Tue Jan 19 07:49:26 2021 +0100
s3:utils: Use connection and credentials parser in net util
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 91d20d1d1113f602fad5bb29c2b3186f76682f03
Author: Andreas Schneider <a...@samba.org>
Date: Thu Apr 1 12:03:45 2021 +0200
s3:utils: Add cli_credentials and loadparm_context to net_context
Will be filled later.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 6fe55b2f261362e462ae2867af9321f9a66af093
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 14:54:58 2021 +0100
s3:utils: Migrate net to new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 94fc9ca4c506468ab1907d501c0964d67b9d963c
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 14:54:03 2021 +0100
s3:utils: Remove '-l' for '--long' from net
This conflicts with '--log-basename' from the commend cmdline parser.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit f2b80723d3803f4e21be17f91e5894a46ca39648
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 14:49:07 2021 +0100
examples: Migrate smb2mount to new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 06a1861ca86dad4d9acd7301324c1c3267bb60f9
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 14:47:01 2021 +0100
examples: Pass cli_credentials to connect_one in smb2mount
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 8b01db48f430d7e0cc6bac8dc4bd0d913d1cfcc4
Author: Andreas Schneider <a...@samba.org>
Date: Tue Jan 19 07:37:48 2021 +0100
docs-xml: Update smbtree manpage for new cmdline opition parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit e8ba85b4a806b242f7e944719dca801880d6f15d
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 14:43:17 2021 +0100
s3:utils: Migrate smbtree to new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 5faa0cc81f316fe1fb9e4dfc77c65d605b0b6f84
Author: Andreas Schneider <a...@samba.org>
Date: Tue Jan 19 07:31:04 2021 +0100
docs-xml: Update smbcquotas manpage for new cmdline opition parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 7b0b9826c289a4e2e5a684639a8bd0c735602a06
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 14:38:17 2021 +0100
s3:utils: Migrate smbcquotas to the new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 9fccbfd5d955724ca4aed40975411d779aa142f0
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 14:37:27 2021 +0100
s3:utils: Rename --user to --quota-user in smbcquotas
This conflicts with the common -U|--user option
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit fb89a5f38e1e7b482285e7e9fb88cd69705348b6
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 14:23:31 2021 +0100
s3:utils: Use samba_cmdline_burn() in smbget
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit c31d9fa8f5e8d53996b63fef79df555c204d870b
Author: Andreas Schneider <a...@samba.org>
Date: Mon Jan 18 16:52:48 2021 +0100
docs-xml: Update samba-regedit manpage for new cmdline opition parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit b58dc5056e8af2beb732e4e74b7a6eeaa2421844
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 14:18:58 2021 +0100
s3:utils: Migrate samba-regedit to new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 57434b1484ad67b420bf24162335070be63274b6
Author: Andreas Schneider <a...@samba.org>
Date: Mon Jan 18 16:50:24 2021 +0100
docs-xml: Update smbcacls manpage for new cmdline opition parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit e652f542e07f7562db9fa8620e39bcc9e2ebe777
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 14:04:04 2021 +0100
s3:utils: Migrate smbcacls to new cmdline option parser
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 83eea54ff6e83a112b3c747be9aab282212270b2
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 14:07:02 2021 +0100
s3:utils: Use cli_credentials in 'struct cacl_callback_state'
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 1280531a73db20a2df663daeda2aee44dd068d4c
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 13 14:00:56 2021 +0100
s3:utils: Pass cli_credentials to connect_one()
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/net.8.xml | 93 +++---
docs-xml/manpages/samba-regedit.8.xml | 57 ++--
docs-xml/manpages/smbcacls.1.xml | 62 ++--
docs-xml/manpages/smbcquotas.1.xml | 68 +++--
docs-xml/manpages/smbtree.1.xml | 31 +-
examples/fuse/smb2mount.c | 38 ++-
examples/fuse/wscript_build | 2 +-
selftest/target/Samba3.pm | 2 +-
source3/include/auth_info.h | 69 -----
source3/include/libsmb_internal.h | 5 +-
source3/include/popt_common.h | 49 ---
source3/include/popt_common_cmdline.h | 47 ---
source3/lib/popt_common.c | 337 ---------------------
source3/lib/popt_common_cmdline.c | 292 ------------------
source3/lib/util_cmdline.c | 500 -------------------------------
source3/libsmb/libsmb_context.c | 69 +++--
source3/libsmb/libsmb_dir.c | 16 +-
source3/libsmb/libsmb_file.c | 5 +-
source3/libsmb/libsmb_stat.c | 2 +-
source3/libsmb/libsmb_xattr.c | 5 +-
source3/libsmb/proto.h | 2 -
source3/printing/samba-bgqd.c | 34 ++-
source3/utils/net.c | 179 ++++-------
source3/utils/net.h | 2 +
source3/utils/net_ads.c | 18 +-
source3/utils/net_dom.c | 8 +-
source3/utils/net_help_common.c | 71 +++--
source3/utils/net_proto.h | 3 -
source3/utils/net_rpc.c | 51 +---
source3/utils/net_rpc_shell.c | 8 +-
source3/utils/net_util.c | 163 +---------
source3/utils/regedit.c | 34 ++-
source3/utils/smbcacls.c | 59 ++--
source3/utils/smbcquotas.c | 48 ++-
source3/utils/smbget.c | 4 +-
source3/utils/smbtree.c | 41 ++-
source3/utils/wscript_build | 19 +-
source3/wscript_build | 18 +-
testprogs/blackbox/test_client_etypes.sh | 4 +-
testprogs/blackbox/test_net_ads.sh | 14 +-
testprogs/blackbox/test_net_ads_fips.sh | 6 +-
41 files changed, 552 insertions(+), 1983 deletions(-)
delete mode 100644 source3/include/auth_info.h
delete mode 100644 source3/include/popt_common.h
delete mode 100644 source3/include/popt_common_cmdline.h
delete mode 100644 source3/lib/popt_common.c
delete mode 100644 source3/lib/popt_common_cmdline.c
delete mode 100644 source3/lib/util_cmdline.c
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index 94689e96c98..f5b2b9157ef 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -23,25 +23,43 @@
<command>net</command>
<arg choice="req"><ads|rap|rpc></arg>
<arg choice="opt">-h|--help</arg>
- <arg choice="opt">-w|--workgroup workgroup</arg>
- <arg choice="opt">-W|--myworkgroup myworkgroup</arg>
- <arg choice="opt">-U|--user user</arg>
- <arg choice="opt">-A|--authentication-file authfile</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>
+ <arg choice="opt">-w|--target-workgroup workgroup</arg>
<arg choice="opt">-I|--ipaddress ip-address</arg>
<arg choice="opt">-p|--port port</arg>
- <arg choice="opt">-n myname</arg>
- <arg choice="opt">-s conffile</arg>
+ <arg choice="opt">--myname</arg>
<arg choice="opt">-S|--server server</arg>
- <arg choice="opt">-l|--long</arg>
+ <arg choice="opt">--long</arg>
<arg choice="opt">-v|--verbose</arg>
<arg choice="opt">-f|--force</arg>
- <arg choice="opt">-P|--machine-pass</arg>
- <arg choice="opt">-d debuglevel</arg>
- <arg choice="opt">-V</arg>
<arg choice="opt">--request-timeout seconds</arg>
<arg choice="opt">-t|--timeout seconds</arg>
<arg choice="opt">-i|--stdin</arg>
- <arg choice="opt">--tallocreport</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -66,31 +84,14 @@
<title>OPTIONS</title>
<variablelist>
- &stdarg.help;
- &stdarg.kerberos;
-
<varlistentry>
- <term>-w|--workgroup target-workgroup</term>
+ <term>-w|--target-workgroup target-workgroup</term>
<listitem><para>
Sets target workgroup or domain. You have to specify
either this option or the IP address or the name of a server.
</para></listitem>
</varlistentry>
- <varlistentry>
- <term>-W|--myworkgroup workgroup</term>
- <listitem><para>
- Sets client workgroup or domain
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-U|--user user</term>
- <listitem><para>
- User name to use
- </para></listitem>
- </varlistentry>
-
<varlistentry>
<term>-I|--ipaddress ip-address</term>
<listitem><para>
@@ -108,8 +109,6 @@
</para></listitem>
</varlistentry>
- &stdarg.netbios.name;
-
<varlistentry>
<term>-S|--server server</term>
<listitem><para>
@@ -139,13 +138,6 @@
</para></listitem>
</varlistentry>
- <varlistentry>
- <term>-P|--machine-pass</term>
- <listitem><para>
- Make queries to the external server using the machine account
of the local server.
- </para></listitem>
- </varlistentry>
-
<varlistentry>
<term>--request-timeout 30</term>
<listitem><para>
@@ -161,13 +153,6 @@
</para></listitem>
</varlistentry>
- <varlistentry>
- <term>--use-ccache</term>
- <listitem><para>
- Try to use the credentials cached by winbind.
- </para></listitem>
- </varlistentry>
-
<varlistentry>
<term>-i|--stdin</term>
<listitem><para>
@@ -175,14 +160,6 @@
</para></listitem>
</varlistentry>
- <varlistentry>
- <term>--tallocreport</term>
- <listitem><para>
- Generate a talloc report while processing a net
- command.
- </para></listitem>
- </varlistentry>
-
<varlistentry>
<term>-T|--test</term>
<listitem><para>Only test command sequence, dry-run.
@@ -202,7 +179,7 @@
</varlistentry>
<varlistentry>
- <term>-n|--myname MYNAME</term>
+ <term>--myname MYNAME</term>
<listitem><para>Use MYNAME as a requester name for a net
subcommand.
</para></listitem>
</varlistentry>
@@ -333,7 +310,7 @@
</varlistentry>
<varlistentry>
- <term>-R|--rid RID</term>
+ <term>--rid RID</term>
<listitem><para>Sets the rid of a group mapping
(used in "net groupmap set").
</para></listitem>
@@ -412,9 +389,9 @@
directory.</para></listitem>
</varlistentry>
- &stdarg.encrypt;
- &popt.common.samba.client;
-
+ &cmdline.common.samba.client;
+ &cmdline.common.connection;
+ &cmdline.common.credentials;
</variablelist>
</refsect1>
diff --git a/docs-xml/manpages/samba-regedit.8.xml
b/docs-xml/manpages/samba-regedit.8.xml
index 719b5e11935..aa2668e869e 100644
--- a/docs-xml/manpages/samba-regedit.8.xml
+++ b/docs-xml/manpages/samba-regedit.8.xml
@@ -19,26 +19,34 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>samba-regedit</command>
- <arg choice="opt">--help</arg>
+ <arg choice="opt">-?|--help</arg>
<arg choice="opt">--usage</arg>
- <arg choice="opt">-d <debug level></arg>
- <arg choice="opt">-s <configuration file></arg>
- <arg choice="opt">-l <log directory></arg>
- <arg choice="opt">-V</arg>
- <arg choice="opt">--option=<parameter>=<value></arg>
- <arg choice="opt">--socket-options=<SOCKETOPTIONS></arg>
- <arg choice="opt">--netbiosname=<NETBIOSNAME></arg>
- <arg choice="opt">--workgroup=<WORKGROUP></arg>
- <arg choice="opt">--scope=<SCOPE></arg>
- <arg choice="opt">--user=<USERNAME></arg>
- <arg choice="opt">-N</arg>
- <arg choice="opt">-k</arg>
- <arg choice="opt">--authentication-file=<FILE></arg>
- <arg choice="opt">--signing=[on|off|required]</arg>
- <arg choice="opt">-P</arg>
- <arg choice="opt">-e</arg>
- <arg choice="opt">-C</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>
@@ -55,15 +63,10 @@
<refsect1>
<title>OPTIONS</title>
<variablelist>
- &stdarg.help;
- &stdarg.client.debug;
- <varlistentry>
- <term>--usage</term>
- <listitem><para>Display brief usage message.</para></listitem>
- </varlistentry>
- &popt.common.samba;
- &popt.common.connection;
- &popt.common.credentials;
+ &popt.autohelp;
+ &cmdline.common.samba.client;
+ &cmdline.common.connection;
+ &cmdline.common.credentials;
</variablelist>
</refsect1>
diff --git a/docs-xml/manpages/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml
index d10a0b0403d..715308bf73d 100644
--- a/docs-xml/manpages/smbcacls.1.xml
+++ b/docs-xml/manpages/smbcacls.1.xml
@@ -21,25 +21,50 @@
<command>smbcacls</command>
<arg choice="req">//server/share</arg>
<arg choice="req">/filename</arg>
- <arg choice="opt">-D|--delete acl</arg>
- <arg choice="opt">-M|--modify acl</arg>
- <arg choice="opt">-a|--add acl</arg>
- <arg choice="opt">-S|--set acl</arg>
- <arg choice="opt">-C|--chown name</arg>
- <arg choice="opt">-G|--chgrp name</arg>
- <arg choice="opt">-I allow|remove|copy</arg>
+
+ <arg choice="opt">-D|--delete=ACL</arg>
+ <arg choice="opt">-M|--modify=ACL</arg>
+ <arg choice="opt">-a|--add=ACL</arg>
+ <arg choice="opt">-S|--set=ACLS</arg>
+ <arg choice="opt">-C|--chown=USERNAME</arg>
+ <arg choice="opt">-G|--chgrp=GROUPNAME</arg>
+ <arg choice="opt">-I|--inherit=STRING</arg>
<arg choice="opt">--propagate-inheritance</arg>
<arg choice="opt">--numeric</arg>
- <arg choice="opt">-t</arg>
- <arg choice="opt">-U username</arg>
- <arg choice="opt">-d</arg>
- <arg choice="opt">-e</arg>
- <arg choice="opt">-m|--max-protocol LEVEL</arg>
- <arg choice="opt">--query-security-info FLAGS</arg>
- <arg choice="opt">--set-security-info FLAGS</arg>
<arg choice="opt">--sddl</arg>
- <arg choice="opt">--domain-sid SID</arg>
+ <arg choice="opt">--query-security-info=INT</arg>
+ <arg choice="opt">--set-security-info=INT</arg>
+ <arg choice="opt">-t|--test-args</arg>
+ <arg choice="opt">--domain-sid=SID</arg>
<arg choice="opt">-x|--maximum-access</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>
@@ -206,11 +231,10 @@
</para></listitem>
</varlistentry>
- &stdarg.server.debug;
- &popt.common.samba;
- &popt.common.credentials;
- &popt.common.connection;
&popt.autohelp;
+ &cmdline.common.samba.client;
+ &cmdline.common.connection;
+ &cmdline.common.credentials;
</variablelist>
</refsect1>
diff --git a/docs-xml/manpages/smbcquotas.1.xml
b/docs-xml/manpages/smbcquotas.1.xml
index 5359dca38c3..0d9b6d69e29 100644
--- a/docs-xml/manpages/smbcquotas.1.xml
+++ b/docs-xml/manpages/smbcquotas.1.xml
@@ -20,26 +20,41 @@
<cmdsynopsis>
<command>smbcquotas</command>
<arg choice="req">//server/share</arg>
- <arg choice="opt">-u|--user user</arg>
+ <arg choice="opt">-u|--quota-user=USER</arg>
<arg choice="opt">-L|--list</arg>
<arg choice="opt">-F|--fs</arg>
- <arg choice="opt">-S|--set QUOTA_SET_COMMAND</arg>
+ <arg choice="opt">-S|--set=SETSTRING</arg>
<arg choice="opt">-n|--numeric</arg>
- <arg choice="opt">-t|--test-args</arg>
<arg choice="opt">-v|--verbose</arg>
-
- <arg choice="opt">-d debuglevel</arg>
- <arg choice="opt">-s configfile</arg>
- <arg choice="opt">-l logdir</arg>
- <arg choice="opt">-V</arg>
-
- <arg choice="opt">-U username</arg>
- <arg choice="opt">-m|--max-protocol LEVEL</arg>
- <arg choice="opt">-N</arg>
- <arg choice="opt">-k</arg>
- <arg choice="opt">-A</arg>
-
-
+ <arg choice="opt">-t|--test-args</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>
@@ -61,7 +76,7 @@
<variablelist>
<varlistentry>
- <term>-u|--user user</term>
+ <term>-u|--quota-user user</term>
<listitem><para> Specifies the user of whom the quotas are get
or set.
By default the current user's username will be
used.</para></listitem>
</varlistentry>
@@ -96,17 +111,6 @@
to a readable string format.</para></listitem>
</varlistentry>
- <varlistentry>
- <term>-m|--max-protocol PROTOCOL_NAME</term>
- <listitem><para>This allows the user to select the
- highest SMB protocol level that smbcquotas will use to
- connect to the server. By default this is set to
- NT1, which is the highest available SMB1 protocol.
- To connect using SMB2 or SMB3 protocol, use the
- strings SMB2 or SMB3 respectively.
- </para></listitem>
- </varlistentry>
-
<varlistentry>
<term>-t|--test-args</term>
<listitem><para>
@@ -120,13 +124,11 @@
Be verbose.
</para></listitem>
</varlistentry>
-
- &stdarg.server.debug;
- &popt.common.samba;
- &popt.common.credentials;
&popt.autohelp;
-
+ &cmdline.common.samba.client;
+ &cmdline.common.connection;
+ &cmdline.common.credentials;
</variablelist>
</refsect1>
diff --git a/docs-xml/manpages/smbtree.1.xml b/docs-xml/manpages/smbtree.1.xml
index 242747ce70f..b1ba700292b 100644
--- a/docs-xml/manpages/smbtree.1.xml
+++ b/docs-xml/manpages/smbtree.1.xml
@@ -20,8 +20,29 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>smbtree</command>
- <arg choice="opt">-D</arg>
- <arg choice="opt">-S</arg>
+ <arg choice="opt">-D|--domains</arg>
+ <arg choice="opt">-S|--servers</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">-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>
@@ -59,11 +80,9 @@
</para></listitem>
</varlistentry>
- &stdarg.server.debug;
- &popt.common.samba;
- &popt.common.credentials;
&popt.autohelp;
-
+ &cmdline.common.samba.client;
+ &cmdline.common.credentials;
</variablelist>
</refsect1>
diff --git a/examples/fuse/smb2mount.c b/examples/fuse/smb2mount.c
index aefa90c4c78..7133927ad16 100644
--- a/examples/fuse/smb2mount.c
+++ b/examples/fuse/smb2mount.c
@@ -20,12 +20,12 @@
#include "source3/include/includes.h"
--
Samba Shared Repository
