The branch, master has been updated
via b053bea0af2 s4/torture/masktest: don't ignore unknown options
via 0c47f244312 s4/torture/locktest: don't ignore unknown options
via f6be1c18bf7 s4/torture/gentest: don't ignore unknown options
via ecb27e02e11 s4/regtree: don't ignore unknown options
via ac86779fe49 s4/regshell: don't ignore unknown options
via 604ce3d85a8 s4/regpatch: don't ignore unknown options
via 5c75b5bdeb9 s4/regdiff: don't ignore unknown options
via 08532b3d2e0 s4/cifsdd: don't ignore unknown options
via ac292ec428e testparm: don't ignore unknown options
via b851d48277f split_tokens: don't ignore unknown options
via 5562674a218 smbtree: don't ignore unknown options
via d841457aedd smbget: don't ignore unknown options
via 46a0da16710 smbcquotas: don't ignore unknown options
via 3755304b6ef smbcacls: don't ignore unknown options
via 5a2b4ba0598 sharesec: don't ignore unknown options
via 246d4f7b934 regedit: don't ignore unknown options
via 372adfda9f0 profiles: don't ignore unknown options
via bcc4756d829 pdbedit: don't ignore unknown options
via 5536e7981c3 ntlm_auth: don't ignore unknown options
via ff6a16806f6 nmblookup: don't ignore unknown options
via c84916fef55 mvxattr: don't ignore unknown options
via 72a6cf1a8a2 log2pcaphex: don't ignore unknown options
via 4056bebf05f s3/async-tracker: don't ignore unknown options
via 96ab7909bd9 vfstest: don't ignore unknown options
via e3c5516dc57 pdbtest: don't ignore unknown options
via 6afa1b3485c rpcclient: don't ignore unknown options
via d5f36072334 s3/param: don't ignore unknown options
via 08512e3a541 source3/lib/smbconf: don't ignore unknown options
via 98c977f44b6 nmblookup: don't ignore unknown options
via 6845051266a s4/smbclient: don't ignore unknown options
via 4053a59d8dc smbstatus: don't ignore unknown options
via c87cc09315a texpect: don't ignore unknown options
via d179c4f49b3 smbclient: don't ignore unknown options
via 09fd46aa1cb selftest: remove unsupported smbcacls option --get
via 29910da882d lib/cmdline: restore s3 option name --max-protocol for
MAXPROTOCOL from 4.14
via 9a3b7f1338e manpages: remove duplicate options from smbclient
via fdfc475000f selftest: fix ---configfile option
via 8f3ef4e6c5a lib/cmdline: fix --configfile handling of
POPT_COMMON_CONFIG_ONLY used by ntlm_auth
from efba2c445c5 gpo: Add Chromium Group Policy
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b053bea0af2b2f059d7ed2c920f283d82339022f
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:27:51 2021 +0200
s4/torture/masktest: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
Autobuild-User(master): Ralph Böhme <s...@samba.org>
Autobuild-Date(master): Fri Sep 10 16:02:10 UTC 2021 on sn-devel-184
commit 0c47f244312f193c299d5b5b7b00db90364f8c8e
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:27:13 2021 +0200
s4/torture/locktest: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit f6be1c18bf78db9e45be953d95ef8581daed5b4b
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:26:01 2021 +0200
s4/torture/gentest: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit ecb27e02e113c597f952457e8a7803325c4c620e
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:25:30 2021 +0200
s4/regtree: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit ac86779fe490318a943ab90e5d117537e839b55f
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:23:59 2021 +0200
s4/regshell: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 604ce3d85a879aa50c045b1f36c0580748b72eb7
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:22:12 2021 +0200
s4/regpatch: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 5c75b5bdeb9b39843f115fe07f1a44689af3fcc5
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:21:31 2021 +0200
s4/regdiff: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 08532b3d2e0f66ee524401b8b939b3af31b6b7cd
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:16:30 2021 +0200
s4/cifsdd: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit ac292ec428ea8ef6702e028c15077818000dfa87
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:15:49 2021 +0200
testparm: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit b851d48277f226ff825b4aaf17483e2d91c54451
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:14:40 2021 +0200
split_tokens: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 5562674a2188d4e11fbdfcbed7bf1fba02af9e90
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:13:48 2021 +0200
smbtree: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit d841457aedd8715ceacb20af8f1ae42cbf8ebf49
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:12:57 2021 +0200
smbget: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 46a0da16710f99f33780d030557562e1a52a8cba
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:12:21 2021 +0200
smbcquotas: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 3755304b6efb98739aca3aa121c095302b09e631
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:11:43 2021 +0200
smbcacls: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 5a2b4ba059809a1e16124bf448a9398822fe5c80
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:11:07 2021 +0200
sharesec: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 246d4f7b934fbfa75d967aee1ff6bd64866995d1
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:10:39 2021 +0200
regedit: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 372adfda9f0aa8f91db6b5dc4357d848baa9fab3
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:09:34 2021 +0200
profiles: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit bcc4756d8293e452d09a6a73005302eddb6c1f28
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:08:59 2021 +0200
pdbedit: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 5536e7981c3902014e91cdfa5bd9a17276e41be7
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:08:37 2021 +0200
ntlm_auth: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit ff6a16806f6a030a36179b1e9db699ae72670db4
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:07:48 2021 +0200
nmblookup: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit c84916fef5520795d54a29e8e8e2817dd8322f30
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:06:54 2021 +0200
mvxattr: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 72a6cf1a8a2903518488cff1bdadd001c5b0b281
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:05:58 2021 +0200
log2pcaphex: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 4056bebf05f4d1e0bfcbc5fe53d63b3bab9e031f
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:05:02 2021 +0200
s3/async-tracker: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 96ab7909bd9eea14ba3aad535c28d53c184341a2
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:04:21 2021 +0200
vfstest: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit e3c5516dc578aee25aaaac1ab7a66ede9d313be0
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:03:21 2021 +0200
pdbtest: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 6afa1b3485cef59676dbccf0276bdfa289e009b4
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 07:01:56 2021 +0200
rpcclient: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit d5f360723349c26a50472188e4f299def5b82742
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 06:56:36 2021 +0200
s3/param: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 08512e3a54180253445a16e976dd4f6ef4f2a799
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 06:30:45 2021 +0200
source3/lib/smbconf: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 98c977f44b6086e2c5cec52451078a6ade81d4a8
Author: Ralph Boehme <s...@samba.org>
Date: Thu Sep 9 18:15:51 2021 +0200
nmblookup: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 6845051266a785bc26356e296bd716162e8a133e
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 05:50:07 2021 +0200
s4/smbclient: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 4053a59d8dc95ff4de2f6f5c50f7007b6456141f
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 05:46:27 2021 +0200
smbstatus: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit c87cc09315a169300e57a58b88587e54fcf29d8f
Author: Ralph Boehme <s...@samba.org>
Date: Thu Sep 9 18:14:36 2021 +0200
texpect: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit d179c4f49b37dbcd04197b8cc31933e19dd8ac9a
Author: Stefan Metzmacher <me...@samba.org>
Date: Thu Sep 9 16:45:37 2021 +0200
smbclient: don't ignore unknown options
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Pair-Programmed-With: Stefan Metzmacher <me...@samba.org>
Signed-off-by: Ralph Boehme <s...@samba.org>
Signed-off-by: Stefan Metzmacher <me...@samba.org>
commit 09fd46aa1cb6c1e24948b7d370a4851191b205b2
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 11:29:35 2021 +0200
selftest: remove unsupported smbcacls option --get
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 29910da882d75b20d63714a1365a7b0dba6904a7
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 11:22:07 2021 +0200
lib/cmdline: restore s3 option name --max-protocol for MAXPROTOCOL from 4.14
s4 used --maxprotocol, s3 used --max-protocol. We should continue supporting
--max-protocol.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 9a3b7f1338e2947aa1cbf1ae34d0e1e7cb692ee9
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 11:21:19 2021 +0200
manpages: remove duplicate options from smbclient
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit fdfc475000f606cc9e4ac160350f7ced64749589
Author: Ralph Boehme <s...@samba.org>
Date: Fri Sep 10 11:09:25 2021 +0200
selftest: fix ---configfile option
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 8f3ef4e6c5a440c6582f7af268c6c27c8a2273d4
Author: Stefan Metzmacher <me...@samba.org>
Date: Thu Sep 9 11:11:03 2021 +0200
lib/cmdline: fix --configfile handling of POPT_COMMON_CONFIG_ONLY used by
ntlm_auth
ntlm_auth only every knew about '--configfile' without the '-s' alias,
keep it that way and make sure we actually process the argument via
the OPT_CONFIGFILE handling.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/build/DTD/samba.entities | 6 +--
docs-xml/manpages/mdsearch.1.xml | 2 +-
docs-xml/manpages/net.8.xml | 2 +-
docs-xml/manpages/nmblookup.1.xml | 2 +-
docs-xml/manpages/rpcclient.1.xml | 2 +-
docs-xml/manpages/samba-regedit.8.xml | 2 +-
docs-xml/manpages/smbcacls.1.xml | 2 +-
docs-xml/manpages/smbclient.1.xml | 49 +---------------------
docs-xml/manpages/smbcquotas.1.xml | 2 +-
docs-xml/manpages/winexe.1.xml | 2 +-
lib/cmdline/cmdline.c | 5 +--
lib/texpect/texpect.c | 8 +++-
libcli/nbt/tools/nmblookup.c | 5 +++
python/samba/tests/blackbox/smbcacls.py | 2 +-
.../blackbox/smbcacls_propagate_inhertance.py | 2 +-
source3/client/client.c | 6 ++-
source3/lib/smbconf/testsuite.c | 11 ++++-
source3/param/test_lp_load.c | 11 ++++-
source3/rpcclient/rpcclient.c | 6 +++
source3/torture/pdbtest.c | 11 ++++-
source3/torture/vfstest.c | 12 +++++-
source3/utils/async-tracker.c | 5 +++
source3/utils/log2pcaphex.c | 5 +++
source3/utils/mvxattr.c | 5 +++
source3/utils/net_help_common.c | 2 +-
source3/utils/nmblookup.c | 5 +++
source3/utils/ntlm_auth.c | 6 +++
source3/utils/pdbedit.c | 5 +++
source3/utils/profiles.c | 5 +++
source3/utils/regedit.c | 8 +++-
source3/utils/sharesec.c | 5 +++
source3/utils/smbcacls.c | 5 +++
source3/utils/smbcquotas.c | 5 +++
source3/utils/smbget.c | 5 +++
source3/utils/smbtree.c | 12 +++++-
source3/utils/split_tokens.c | 11 ++++-
source3/utils/status.c | 5 +++
source3/utils/testparm.c | 11 ++++-
source4/client/cifsdd.c | 8 +++-
source4/client/client.c | 5 +++
source4/lib/registry/tools/regdiff.c | 5 +++
source4/lib/registry/tools/regpatch.c | 7 ++++
source4/lib/registry/tools/regshell.c | 7 ++++
source4/lib/registry/tools/regtree.c | 7 ++++
source4/torture/gentest.c | 5 +++
source4/torture/locktest.c | 5 +++
source4/torture/masktest.c | 5 +++
testprogs/blackbox/test_client_kerberos.sh | 2 +-
48 files changed, 233 insertions(+), 78 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/build/DTD/samba.entities
b/docs-xml/build/DTD/samba.entities
index beff3cb1f6e..0a4a21db63e 100644
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -556,9 +556,9 @@
</varlistentry>
'>
-<!ENTITY cmdline.common.connection.maxprotocol '
+<!ENTITY cmdline.common.connection.max-protocol '
<varlistentry>
- <term>-m|--maxprotocol=MAXPROTOCOL</term>
+ <term>-m|--max-protocol=MAXPROTOCOL</term>
<listitem>
<para>
The value of the parameter (a string) is the highest
@@ -577,7 +577,7 @@
<!ENTITY cmdline.common.connection '
&cmdline.common.connection.nameresolve;
&cmdline.common.connection.socketoptions;
-&cmdline.common.connection.maxprotocol;
+&cmdline.common.connection.max-protocol;
&cmdline.common.connection.netbiosname;
&cmdline.common.connection.netbiosscope;
&cmdline.common.connection.workgroup;
diff --git a/docs-xml/manpages/mdsearch.1.xml b/docs-xml/manpages/mdsearch.1.xml
index 14bc825feac..e5b443f4a75 100644
--- a/docs-xml/manpages/mdsearch.1.xml
+++ b/docs-xml/manpages/mdsearch.1.xml
@@ -34,7 +34,7 @@
<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">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index aade21a5a5a..1bd82933137 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -32,7 +32,7 @@
<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">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
diff --git a/docs-xml/manpages/nmblookup.1.xml
b/docs-xml/manpages/nmblookup.1.xml
index 9ac602cbd59..08b0882504f 100644
--- a/docs-xml/manpages/nmblookup.1.xml
+++ b/docs-xml/manpages/nmblookup.1.xml
@@ -40,7 +40,7 @@
<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">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
diff --git a/docs-xml/manpages/rpcclient.1.xml
b/docs-xml/manpages/rpcclient.1.xml
index 16fbe9207e4..7c0c380cd8d 100644
--- a/docs-xml/manpages/rpcclient.1.xml
+++ b/docs-xml/manpages/rpcclient.1.xml
@@ -34,7 +34,7 @@
<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">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
diff --git a/docs-xml/manpages/samba-regedit.8.xml
b/docs-xml/manpages/samba-regedit.8.xml
index aa2668e869e..2cda0c00bdb 100644
--- a/docs-xml/manpages/samba-regedit.8.xml
+++ b/docs-xml/manpages/samba-regedit.8.xml
@@ -30,7 +30,7 @@
<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">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
diff --git a/docs-xml/manpages/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml
index 715308bf73d..9cc2d66a898 100644
--- a/docs-xml/manpages/smbcacls.1.xml
+++ b/docs-xml/manpages/smbcacls.1.xml
@@ -48,7 +48,7 @@
<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">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
diff --git a/docs-xml/manpages/smbclient.1.xml
b/docs-xml/manpages/smbclient.1.xml
index 48ba59525d6..40f9d896e30 100644
--- a/docs-xml/manpages/smbclient.1.xml
+++ b/docs-xml/manpages/smbclient.1.xml
@@ -43,7 +43,7 @@
<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">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
@@ -62,53 +62,6 @@
<arg choice="opt">-V|--version</arg>
<arg choice="opt">-c|--command=STRING</arg>
</cmdsynopsis>
-
- <cmdsynopsis>
- <command>smbclient</command>
- <arg choice="req">servicename</arg>
- <arg choice="opt">password</arg>
- <arg choice="opt">-?|--help</arg>
- <arg choice="opt">--usage</arg>
- <arg choice="opt">-M|--message=HOST</arg>
- <arg choice="opt">-I|--ip-address=IP</arg>
- <arg choice="opt">-E|--stderr</arg>
- <arg choice="opt">-L|--list=HOST</arg>
- <arg choice="opt">-T|--tar=<c|x>IXFvgbNan</arg>
- <arg choice="opt">-D|--directory=DIR</arg>
- <arg choice="opt">-b|--send-buffer=BYTES</arg>
- <arg choice="opt">-t|--timeout=SECONDS</arg>
- <arg choice="opt">-p|--port=PORT</arg>
- <arg choice="opt">-g|--grepable</arg>
- <arg choice="opt">-q|--quiet</arg>
- <arg choice="opt">-B|--browse</arg>
- <arg choice="opt">-d|--debuglevel=DEBUGLEVEL</arg>
- <arg choice="opt">--debug-stdout</arg>
- <arg choice="opt">-s|--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">-n|--netbiosname=NETBIOSNAME</arg>
- <arg choice="opt">-W|--workgroup=WORKGROUP</arg>
- <arg choice="opt">--realm=REALM</arg>
- <arg choice="opt">--netbios-scope=SCOPE</arg>
- <arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</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">-k|--kerberos=STRING</arg>
- </cmdsynopsis>
</refsynopsisdiv>
<refsect1>
diff --git a/docs-xml/manpages/smbcquotas.1.xml
b/docs-xml/manpages/smbcquotas.1.xml
index 0d9b6d69e29..b5ce53ce31b 100644
--- a/docs-xml/manpages/smbcquotas.1.xml
+++ b/docs-xml/manpages/smbcquotas.1.xml
@@ -38,7 +38,7 @@
<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">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
diff --git a/docs-xml/manpages/winexe.1.xml b/docs-xml/manpages/winexe.1.xml
index a7768424dd2..ddce91e3fa8 100644
--- a/docs-xml/manpages/winexe.1.xml
+++ b/docs-xml/manpages/winexe.1.xml
@@ -34,7 +34,7 @@
<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">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
diff --git a/lib/cmdline/cmdline.c b/lib/cmdline/cmdline.c
index a299a229f69..40292a6a332 100644
--- a/lib/cmdline/cmdline.c
+++ b/lib/cmdline/cmdline.c
@@ -487,9 +487,8 @@ static struct poptOption popt_common_config[] = {
},
{
.longName = "configfile",
- .shortName = 's',
.argInfo = POPT_ARG_STRING,
- .val = 's',
+ .val = OPT_CONFIGFILE,
.descrip = "Use alternative configuration file",
.argDescrip = "CONFIGFILE",
},
@@ -691,7 +690,7 @@ static struct poptOption popt_common_connection[] = {
.argDescrip = "SOCKETOPTIONS",
},
{
- .longName = "maxprotocol",
+ .longName = "max-protocol",
.shortName = 'm',
.argInfo = POPT_ARG_STRING,
.val = 'm',
diff --git a/lib/texpect/texpect.c b/lib/texpect/texpect.c
index 5657efa44d1..1a6ebf486ae 100644
--- a/lib/texpect/texpect.c
+++ b/lib/texpect/texpect.c
@@ -388,7 +388,13 @@ int main(int argc, const char **argv)
}
while ((optidx = poptGetNextOpt(pc)) != -1) {
- ;;
+ switch (optidx) {
+ case POPT_ERROR_BADOPT:
+ fprintf(stderr, "\nInvalid option %s: %s\n\n",
+ poptBadOption(pc, 0), poptStrerror(optidx));
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
+ }
}
instruction_file = poptGetArg(pc);
diff --git a/libcli/nbt/tools/nmblookup.c b/libcli/nbt/tools/nmblookup.c
index 689240f90a4..6ca38faa863 100644
--- a/libcli/nbt/tools/nmblookup.c
+++ b/libcli/nbt/tools/nmblookup.c
@@ -433,6 +433,11 @@ int main(int argc, const char *argv[])
case OPT_CASE_SENSITIVE:
options.case_sensitive = true;
break;
+ case POPT_ERROR_BADOPT:
+ fprintf(stderr, "\nInvalid option %s: %s\n\n",
+ poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
}
}
diff --git a/python/samba/tests/blackbox/smbcacls.py
b/python/samba/tests/blackbox/smbcacls.py
index 172cc56e73d..608e2c918af 100644
--- a/python/samba/tests/blackbox/smbcacls.py
+++ b/python/samba/tests/blackbox/smbcacls.py
@@ -120,7 +120,7 @@ class SmbCaclsBlockboxTestBase(BlackboxTestCase):
def file_ace_check(self, remotepath, ace):
smbcacls_args = self.build_test_cmd("smbcacls",
- ["//%s/%s" % (self.server, self.share), "--get",
+ ["//%s/%s" % (self.server, self.share),
remotepath])
try:
output = self.check_output(smbcacls_args)
diff --git a/python/samba/tests/blackbox/smbcacls_propagate_inhertance.py
b/python/samba/tests/blackbox/smbcacls_propagate_inhertance.py
index ed8455a6bf8..a7be768a9c9 100644
--- a/python/samba/tests/blackbox/smbcacls_propagate_inhertance.py
+++ b/python/samba/tests/blackbox/smbcacls_propagate_inhertance.py
@@ -886,7 +886,7 @@ class InheritanceSmbCaclsTests(SmbCaclsBlockboxTestBase):
self.smb_cacls(["--propagate-inheritance", "--set",
dir_acl_str, self.oi_dir])
- out = self.smb_cacls(["--get", self.oi_dir])
+ out = self.smb_cacls([self.oi_dir])
#count the ACL(s)
nacls = len([i for i in out.decode().split("\n") if
i.startswith("ACL")])
diff --git a/source3/client/client.c b/source3/client/client.c
index b20ac986dc9..98425048f4b 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -6536,7 +6536,11 @@ int main(int argc,char *argv[])
break;
case 'B':
return(do_smb_browse());
-
+ case POPT_ERROR_BADOPT:
+ fprintf(stderr, "\nInvalid option %s: %s\n\n",
+ poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
}
}
diff --git a/source3/lib/smbconf/testsuite.c b/source3/lib/smbconf/testsuite.c
index fa97a52132a..1dd7eecf24e 100644
--- a/source3/lib/smbconf/testsuite.c
+++ b/source3/lib/smbconf/testsuite.c
@@ -290,6 +290,7 @@ int main(int argc, const char **argv)
bool ret;
poptContext pc;
TALLOC_CTX *mem_ctx = talloc_stackframe();
+ int opt;
struct poptOption long_options[] = {
POPT_COMMON_SAMBA
@@ -317,7 +318,15 @@ int main(int argc, const char **argv)
goto done;
}
- while(poptGetNextOpt(pc) != -1) { }
+ while ((opt = poptGetNextOpt(pc)) != -1) {
+ switch (opt) {
+ case POPT_ERROR_BADOPT:
+ fprintf(stderr, "\nInvalid option %s: %s\n\n",
+ poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
+ }
+ }
poptFreeContext(pc);
diff --git a/source3/param/test_lp_load.c b/source3/param/test_lp_load.c
index b25a54798f8..2c6a5c8891b 100644
--- a/source3/param/test_lp_load.c
+++ b/source3/param/test_lp_load.c
@@ -27,6 +27,7 @@ int main(int argc, const char **argv)
poptContext pc;
char *count_str = NULL;
int i, count = 1;
+ int opt;
bool ok;
struct poptOption long_options[] = {
@@ -70,7 +71,15 @@ int main(int argc, const char **argv)
}
poptSetOtherOptionHelp(pc, "[OPTION...] <config-file>");
- while(poptGetNextOpt(pc) != -1);
+ while ((opt = poptGetNextOpt(pc)) != -1) {
+ switch (opt) {
+ case POPT_ERROR_BADOPT:
+ fprintf(stderr, "\nInvalid option %s: %s\n\n",
+ poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
+ }
+ }
if (poptPeekArg(pc)) {
config_file = poptGetArg(pc);
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 7c9982b33e9..cf32229f303 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -1198,6 +1198,12 @@ out_free:
result = 1;
goto done;
}
+ break;
+ case POPT_ERROR_BADOPT:
+ fprintf(stderr, "\nInvalid option %s: %s\n\n",
+ poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
}
}
diff --git a/source3/torture/pdbtest.c b/source3/torture/pdbtest.c
index 1a95a3c8646..146320ff453 100644
--- a/source3/torture/pdbtest.c
+++ b/source3/torture/pdbtest.c
@@ -554,6 +554,7 @@ int main(int argc, const char **argv)
struct samu *in = NULL;
NTSTATUS rv;
int i;
+ int opt;
struct timeval tv;
bool error = False;
struct passwd *pwd;
@@ -593,7 +594,15 @@ int main(int argc, const char **argv)
poptSetOtherOptionHelp(pc, "backend[:settings] username");
- while(poptGetNextOpt(pc) != -1);
+ while ((opt = poptGetNextOpt(pc)) != -1) {
+ switch (opt) {
+ case POPT_ERROR_BADOPT:
+ fprintf(stderr, "\nInvalid option %s: %s\n\n",
+ poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
+ }
+ }
poptFreeContext(pc);
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index 5c0ef2d073d..3f01c431289 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -469,6 +469,7 @@ int main(int argc, const char *argv[])
struct cmd_set **cmd_set;
struct conn_struct_tos *c = NULL;
struct vfs_state *vfs;
+ int opt;
int i;
char *filename = NULL;
char *cwd = NULL;
@@ -531,8 +532,15 @@ int main(int argc, const char *argv[])
exit(1);
}
- while(poptGetNextOpt(pc) != -1);
-
+ while ((opt = poptGetNextOpt(pc)) != -1) {
+ switch (opt) {
+ case POPT_ERROR_BADOPT:
+ fprintf(stderr, "\nInvalid option %s: %s\n\n",
+ poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
+ }
+ }
poptFreeContext(pc);
diff --git a/source3/utils/async-tracker.c b/source3/utils/async-tracker.c
index fff85989473..7b6c2c01986 100644
--- a/source3/utils/async-tracker.c
+++ b/source3/utils/async-tracker.c
@@ -267,6 +267,11 @@ int main(int argc, const char **argv)
case 't':
state->loop_type = TEVENT_LOOP;
break;
+ case POPT_ERROR_BADOPT:
+ fprintf(stderr, "\nInvalid option %s: %s\n\n",
+ poptBadOption(pc, 0), poptStrerror(c));
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
}
}
diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c
index f8b5246a43e..2ee2f82af98 100644
--- a/source3/utils/log2pcaphex.c
+++ b/source3/utils/log2pcaphex.c
@@ -334,6 +334,11 @@ int main(int argc, const char **argv)
while((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
+ case POPT_ERROR_BADOPT:
+ fprintf(stderr, "\nInvalid option %s: %s\n\n",
+ poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
}
}
diff --git a/source3/utils/mvxattr.c b/source3/utils/mvxattr.c
index 7fad10bc60f..dd8da7911b8 100644
--- a/source3/utils/mvxattr.c
+++ b/source3/utils/mvxattr.c
@@ -194,6 +194,11 @@ int main(int argc, const char *argv[])
goto done;
}
break;
+ case POPT_ERROR_BADOPT:
+ fprintf(stderr, "\nInvalid option %s: %s\n\n",
+ poptBadOption(pc, 0), poptStrerror(c));
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
}
}
diff --git a/source3/utils/net_help_common.c b/source3/utils/net_help_common.c
index fc6ce913f6d..a861d3ffd14 100644
--- a/source3/utils/net_help_common.c
+++ b/source3/utils/net_help_common.c
@@ -64,7 +64,7 @@ int net_common_flags_usage(struct net_context *c, int argc,
const char **argv)
d_printf(_("\t-R|--name-resolve=NAME-RESOLVE-ORDER\tUse these name "
"resolution services only\n"));
d_printf(_("\t-O|--socket-options=SOCKETOPTIONS\tsocket options to
use\n"));
- d_printf(_("\t-m|--maxprotocol=MAXPROTOCOL\t\tSet max protocol
level\n"));
+ d_printf(_("\t-m|--max-protocol=MAXPROTOCOL\t\tSet max protocol
level\n"));
d_printf(_("\t-n|--netbiosname=NETBIOSNAME\t\tPrimary netbios name\n"));
d_printf(_("\t--netbios-scope=SCOPE\t\t\tUse this Netbios scope\n"));
d_printf(_("\t-W|--workgroup=WORKGROUP\t\tSet the workgroup name\n"));
diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index 86902941746..a78967fdb88 100644
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -389,6 +389,11 @@ int main(int argc, const char *argv[])
case 'T':
translate_addresses = !translate_addresses;
--
Samba Shared Repository
