[SCM] Samba Shared Repository - branch v4-15-test updated
Jule Anger
janger at samba.org
Mon Sep 13 08:52:01 UTC 2021
The branch, v4-15-test has been updated
via bddd7db7b2f WHATSNEW: The New VFS
via bd730209109 Don't use sysconf(_SC_NGROUPS_MAX) on macOS for getgroups()
via 92251109fa2 smbd: fix "ea support = no"
via 13ba74a67a3 WHATSNEW: unknown options now trigger an error in all tools
via cc39fca1f5a WHATSNEW: clarify the -e and -s handling for ldb tools
via b52fdad21fb s4/torture/masktest: don't ignore unknown options
via 1eaab01e178 s4/torture/locktest: don't ignore unknown options
via 047274d1278 s4/torture/gentest: don't ignore unknown options
via 79f231a5484 s4/regtree: don't ignore unknown options
via b87f953efb9 s4/regshell: don't ignore unknown options
via f377070e75b s4/regpatch: don't ignore unknown options
via 9e0b596ab76 s4/regdiff: don't ignore unknown options
via c4dc60a7992 s4/cifsdd: don't ignore unknown options
via c94c2bb7503 testparm: don't ignore unknown options
via 7c0725daaf3 split_tokens: don't ignore unknown options
via ece1e503d84 smbtree: don't ignore unknown options
via 3e5d5713a10 smbget: don't ignore unknown options
via 647e2865eb3 smbcquotas: don't ignore unknown options
via 2270e098c02 smbcacls: don't ignore unknown options
via eeebabe4067 sharesec: don't ignore unknown options
via 9af6e536edd regedit: don't ignore unknown options
via 02144f364e6 profiles: don't ignore unknown options
via 362c9f28a36 pdbedit: don't ignore unknown options
via 609509f8ed1 ntlm_auth: don't ignore unknown options
via 84579c965b1 nmblookup: don't ignore unknown options
via 99eca1a3329 mvxattr: don't ignore unknown options
via df0e4a6b67d log2pcaphex: don't ignore unknown options
via 2f8aabd1761 s3/async-tracker: don't ignore unknown options
via e5f6c2e25c5 vfstest: don't ignore unknown options
via 7bee957378e pdbtest: don't ignore unknown options
via 66dd6cc6286 rpcclient: don't ignore unknown options
via 424135b1796 s3/param: don't ignore unknown options
via 4af952f4ccd source3/lib/smbconf: don't ignore unknown options
via a0e860c2360 nmblookup: don't ignore unknown options
via 6e320e7f767 s4/smbclient: don't ignore unknown options
via 43f57091f7f smbstatus: don't ignore unknown options
via 26ccc96a41d texpect: don't ignore unknown options
via be8c65fb748 smbclient: don't ignore unknown options
via 223ac583cfa selftest: remove unsupported smbcacls option --get
via 619baa2390f lib/cmdline: restore s3 option name --max-protocol for MAXPROTOCOL from 4.14
via ec937b7035d manpages: remove duplicate options from smbclient
via 4ccc9a4c391 selftest: fix ---configfile option
via b2934e2a726 lib/cmdline: fix --configfile handling of POPT_COMMON_CONFIG_ONLY used by ntlm_auth
via 35d474c3030 vfs_btrfs: fix btrfs_fget_compression()
from a7b9904c90b docs: Avoid duplicate information on USER and PASSWD, reference the common section
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-15-test
- Log -----------------------------------------------------------------
commit bddd7db7b2f8f238ae2d7222cc5bbd63545f0eba
Author: Ralph Boehme <slow at samba.org>
Date: Mon Sep 13 07:51:41 2021 +0200
WHATSNEW: The New VFS
Signed-off-by: Ralph Boehme <slow at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(v4-15-test): Jule Anger <janger at samba.org>
Autobuild-Date(v4-15-test): Mon Sep 13 08:51:05 UTC 2021 on sn-devel-184
commit bd7302091099d6b5052f59ea0f5dca4539954327
Author: Alex Richardson <Alexander.Richardson at cl.cam.ac.uk>
Date: Fri Oct 5 09:35:40 2018 +0100
Don't use sysconf(_SC_NGROUPS_MAX) on macOS for getgroups()
On MacOS sysconf(_SC_NGROUPS_MAX) always returns 16. However, this is not
the value used by getgroups(2). MacOS uses nested groups but getgroups(2)
will return the flattened list which can easily exceed 16 groups. In my
testing getgroups() already returns 16 groups on a freshly installed
system. And on a 10.14 system the root user is in more than 16 groups by
default which makes it impossible to run smbd without this change.
Setting _DARWIN_UNLIMITED_GETGROUPS allows getgroups() to return more than
16 groups. This also changes set_unix_security_ctx() to only set up to
16 groups since that is the limit for initgroups() according to the manpage.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=8773
Signed-off-by: Alex Richardson <Alexander.Richardson at cl.cam.ac.uk>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Thu Sep 9 17:43:19 UTC 2021 on sn-devel-184
(cherry picked from commit 2c18a982537ea1a62e4d802c9ae0ef06b36158dc)
commit 92251109fa2211706380ba5729e6dbbcb94d1bd9
Author: Ralph Boehme <slow at samba.org>
Date: Sat Sep 11 12:33:37 2021 +0200
smbd: fix "ea support = no"
Introduced by de83946311d8c1f007c236751280e9f101cc3a29.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14829
Signed-off-by: Ralph Boehme <slow at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Sat Sep 11 21:48:01 UTC 2021 on sn-devel-184
(cherry picked from commit 926db374a615e88003c99a476f45981beb30f8cf)
commit 13ba74a67a31d487a64696f1f7f44ff63da2adb2
Author: Ralph Boehme <slow at samba.org>
Date: Fri Sep 10 18:15:25 2021 +0200
WHATSNEW: unknown options now trigger an error in all tools
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Ralph Boehme <slow at samba.org>
commit cc39fca1f5aec2ab4595e40cd4f2cd864150a1bb
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Sep 9 11:13:21 2021 +0200
WHATSNEW: clarify the -e and -s handling for ldb tools
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit b52fdad21fb1df4726c30f2161eed99ccabc8f41
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Ralph Böhme <slow at samba.org>
Autobuild-Date(master): Fri Sep 10 16:02:10 UTC 2021 on sn-devel-184
(cherry picked from commit b053bea0af2b2f059d7ed2c920f283d82339022f)
commit 1eaab01e1788bb477f4a759adde8d4e6d99f7012
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 0c47f244312f193c299d5b5b7b00db90364f8c8e)
commit 047274d1278dcc10e4f6df42b0948f23c9727c91
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit f6be1c18bf78db9e45be953d95ef8581daed5b4b)
commit 79f231a548425a20f669495013eb8221651b1f1d
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit ecb27e02e113c597f952457e8a7803325c4c620e)
commit b87f953efb97ae8a7c48f123181ae66cc57a30ff
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit ac86779fe490318a943ab90e5d117537e839b55f)
commit f377070e75b33a5b42f5f26e9e20bf4555dca33b
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 604ce3d85a879aa50c045b1f36c0580748b72eb7)
commit 9e0b596ab7612b11c61c13c1966b55c8b10cbb00
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 5c75b5bdeb9b39843f115fe07f1a44689af3fcc5)
commit c4dc60a79925d92d7a116b85a896b5ad23e69e43
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 08532b3d2e0f66ee524401b8b939b3af31b6b7cd)
commit c94c2bb75030898788881cf3eeac805496e7da6b
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit ac292ec428ea8ef6702e028c15077818000dfa87)
commit 7c0725daaf38f988436ebe40e6d3ffdd31a03b5c
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit b851d48277f226ff825b4aaf17483e2d91c54451)
commit ece1e503d8486bb4285ec84bf879620a0b1c8513
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 5562674a2188d4e11fbdfcbed7bf1fba02af9e90)
commit 3e5d5713a10aafae9f3e3e5b6377d1b687b05588
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit d841457aedd8715ceacb20af8f1ae42cbf8ebf49)
commit 647e2865eb3ba5dba1c0e2c2543fedfc45a6d3e4
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 46a0da16710f99f33780d030557562e1a52a8cba)
commit 2270e098c02b7ed8a572e3fcc59ab12cb0b8339f
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 3755304b6efb98739aca3aa121c095302b09e631)
commit eeebabe4067fd5bbbdc77b1c33d07a09214a869a
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 5a2b4ba059809a1e16124bf448a9398822fe5c80)
commit 9af6e536edd624b49e772aeaa82db080e284b035
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 246d4f7b934fbfa75d967aee1ff6bd64866995d1)
commit 02144f364e62062a3317679b52c90aa5ab6a6f41
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 372adfda9f0aa8f91db6b5dc4357d848baa9fab3)
commit 362c9f28a369a039fa966588b125911561b25f56
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit bcc4756d8293e452d09a6a73005302eddb6c1f28)
commit 609509f8ed1a717ec9b03f9b127d1f8f4927b184
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 5536e7981c3902014e91cdfa5bd9a17276e41be7)
commit 84579c965b10cc76d0e5b2174415fd6edf8f3a5c
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit ff6a16806f6a030a36179b1e9db699ae72670db4)
commit 99eca1a3329c391c9790bdfee200c5320d52db07
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit c84916fef5520795d54a29e8e8e2817dd8322f30)
commit df0e4a6b67d54ad1a339a242a11d31409e05e131
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 72a6cf1a8a2903518488cff1bdadd001c5b0b281)
commit 2f8aabd176141d9f094b9fafd0456d994e5e6903
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 4056bebf05f4d1e0bfcbc5fe53d63b3bab9e031f)
commit e5f6c2e25c515a2946fd14727cb1333a56f817e0
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 96ab7909bd9eea14ba3aad535c28d53c184341a2)
commit 7bee957378e2278d8b34104ae2c2d5c48729f564
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit e3c5516dc578aee25aaaac1ab7a66ede9d313be0)
commit 66dd6cc6286abb80f3a8ed1eeaa0f331d08f930d
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 6afa1b3485cef59676dbccf0276bdfa289e009b4)
commit 424135b17963e8c990f9a0d2a662914e967779eb
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit d5f360723349c26a50472188e4f299def5b82742)
commit 4af952f4ccdfa922c0b2088adbaf4e6bc5953d5d
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 08512e3a54180253445a16e976dd4f6ef4f2a799)
commit a0e860c2360b11778978bb397f48d97b0b571f25
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 98c977f44b6086e2c5cec52451078a6ade81d4a8)
commit 6e320e7f767c5fc13412cf5cec08f8704517b15b
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 6845051266a785bc26356e296bd716162e8a133e)
commit 43f57091f7f44c34c8b65ae9644d2c09d8c85991
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 4053a59d8dc95ff4de2f6f5c50f7007b6456141f)
commit 26ccc96a41dd81bbac21f5d73061f69b3d9dcb71
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit c87cc09315a169300e57a58b88587e54fcf29d8f)
commit be8c65fb7480a1e8de276806884254d3b3fbd522
Author: Stefan Metzmacher <metze at 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 <metze at samba.org>
Signed-off-by: Ralph Boehme <slow at samba.org>
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit d179c4f49b37dbcd04197b8cc31933e19dd8ac9a)
commit 223ac583cfa149e647ca846dd980585d25e2350e
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 09fd46aa1cb6c1e24948b7d370a4851191b205b2)
commit 619baa2390f872c86ae05c3bf47e4d9c84045dfa
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 29910da882d75b20d63714a1365a7b0dba6904a7)
commit ec937b7035dbc6452c92f91c8197bf5a34d1c8aa
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 9a3b7f1338e2947aa1cbf1ae34d0e1e7cb692ee9)
commit 4ccc9a4c391614b88f23b31d1d1d3f6e565558e4
Author: Ralph Boehme <slow at 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 <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit fdfc475000f606cc9e4ac160350f7ced64749589)
commit b2934e2a72688f8982ab6dd7511c58acc15c71bd
Author: Stefan Metzmacher <metze at 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 <metze at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
(cherry picked from commit 8f3ef4e6c5a440c6582f7af268c6c27c8a2273d4)
commit 35d474c303004c1a2a82fcd9f8f87a7b28a85713
Author: Ralph Boehme <slow at samba.org>
Date: Mon Aug 9 19:30:21 2021 +0200
vfs_btrfs: fix btrfs_fget_compression()
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14790
RB: vfs_btrfs compression support broken
Reported-by: noel.kuntze at thermi.consulting
Signed-off-by: Ralph Boehme <slow at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit ed35fce4fe48b1fa26854a7b4bb151b5c5fb6fc6)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 21 ++++++++--
buildtools/wafsamba/wscript | 5 ++-
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/include/proto.h | 3 +-
source3/lib/smbconf/testsuite.c | 11 ++++-
source3/lib/system.c | 24 +++++++++--
source3/lib/system_smbd.c | 2 +-
source3/modules/vfs_btrfs.c | 7 ++--
source3/param/test_lp_load.c | 11 ++++-
source3/rpcclient/rpcclient.c | 6 +++
source3/smbd/sec_ctx.c | 2 +-
source3/smbd/trans2.c | 3 +-
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 +-
testsuite/smbd/sec_ctx_utils.c | 2 +-
57 files changed, 286 insertions(+), 94 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 739a0b319ca..424859a0f25 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -64,6 +64,16 @@ bugs CVE-2021-37750 and CVE-2021-36222
NEW FEATURES/CHANGES
====================
+VFS
+---
+
+The effort to modernize Samba's VFS interface is complete and Samba 4.15.0 ships
+with a modernized VFS designed for the post SMB1 world.
+
+For details please refer to the documentation at source3/modules/The_New_VFS.txt
+or visit the <https://wiki.samba.org/index.php/The_New_VFS>.
+
+
Bind DLZ: add the ability to set allow/deny lists for zone transfer clients
---------------------------------------------------------------------------
@@ -104,6 +114,9 @@ These should be stories of the past now. A new command line parser has been
implemented with sanity checking. Also the command line interface has been
simplified and provides better control for encryption, signing and kerberos.
+Previously many tools silently ignored unknown options. To prevent unexpected
+behaviour all tools will now consistently reject unknown options.
+
Also several command line options have a smb.conf variable to control the
default now.
@@ -131,9 +144,11 @@ Options removed:
### Duplicates in command line utils
-ldbadd/ldbsearch/ldbdel/ldbmodify/ldbrename:
--e is not available for --editor anymore
--s is not used for --configfile anymore
+ldbadd/ldbdel/ldbedit/ldbmodify/ldbrename/ldbsearch:
+-e is still available as an alias for --editor,
+ as it used to be.
+-s is no longer reported as an alias for --configfile,
+ it never worked that way as it was shadowed by '-s' for '--scope'.
ndrdump:
-l is not available for --load-dso anymore
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 1aadb9570e1..def13f71c93 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -542,7 +542,10 @@ struct foo bar = { .y = 'X', .x = 1 };
conf.CHECK_HEADERS('strings.h inttypes.h stdint.h unistd.h minix/config.h', add_headers=True)
conf.CHECK_HEADERS('ctype.h', add_headers=True)
- if sys.platform != 'darwin':
+ if sys.platform == 'darwin':
+ conf.DEFINE('_DARWIN_C_SOURCE', 1, add_to_cflags=True)
+ conf.DEFINE('_DARWIN_UNLIMITED_GETGROUPS', 1, add_to_cflags=True)
+ else:
conf.CHECK_HEADERS('standards.h', add_headers=True)
conf.CHECK_HEADERS('stdbool.h stdint.h stdarg.h vararg.h', add_headers=True)
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/include/proto.h b/source3/include/proto.h
index 938a71e8083..eb45179aebb 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -230,7 +230,8 @@ void set_effective_capability(enum smbd_capability capability);
void drop_effective_capability(enum smbd_capability capability);
long sys_random(void);
void sys_srandom(unsigned int seed);
-int groups_max(void);
+int getgroups_max(void);
+int setgroups_max(void);
int sys_getgroups(int setlen, gid_t *gidset);
int sys_setgroups(gid_t UNUSED(primary_gid), int setlen, gid_t *gidset);
uint32_t unix_dev_major(SMB_DEV_T dev);
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/lib/system.c b/source3/lib/system.c
index 5d57ffadda1..a14fc51ca63 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -756,7 +756,7 @@ void sys_srandom(unsigned int seed)
Returns equivalent to NGROUPS_MAX - using sysconf if needed.
****************************************************************************/
-int groups_max(void)
+int setgroups_max(void)
{
#if defined(SYSCONF_SC_NGROUPS_MAX)
int ret = sysconf(_SC_NGROUPS_MAX);
@@ -766,6 +766,24 @@ int groups_max(void)
#endif
}
+int getgroups_max(void)
+{
+#if defined(DARWINOS)
+ /*
+ * On MacOS sysconf(_SC_NGROUPS_MAX) returns 16 due to MacOS's group
+ * nesting. However, The initgroups() manpage states the following:
+ * "Note that OS X supports group membership in an unlimited number
+ * of groups. The OS X kernel uses the group list stored in the process
+ * credentials only as an initial cache. Additional group memberships
+ * are determined by communication between the operating system and the
+ * opendirectoryd daemon."
+ */
+ return INT_MAX;
+#else
+ return setgroups_max();
+#endif
+}
+
/**************************************************************************
Wrap setgroups and getgroups for systems that declare getgroups() as
returning an array of gid_t, but actuall return an array of int.
@@ -831,7 +849,7 @@ static int sys_broken_setgroups(int setlen, gid_t *gidset)
if (setlen == 0)
return 0 ;
- if (setlen < 0 || setlen > groups_max()) {
+ if (setlen < 0 || setlen > setgroups_max()) {
errno = EINVAL;
return -1;
}
@@ -882,7 +900,7 @@ static int sys_bsd_setgroups(gid_t primary_gid, int setlen, const gid_t *gidset)
int ret;
/* setgroups(2) will fail with EINVAL if we pass too many groups. */
- max = groups_max();
+ max = setgroups_max();
/* No group list, just make sure we are setting the efective GID. */
if (setlen == 0) {
diff --git a/source3/lib/system_smbd.c b/source3/lib/system_smbd.c
index 3b1ac9c1c2a..73bffe05f7a 100644
--- a/source3/lib/system_smbd.c
+++ b/source3/lib/system_smbd.c
@@ -205,7 +205,7 @@ bool getgroups_unix_user(TALLOC_CTX *mem_ctx, const char *user,
gid_t primary_gid,
gid_t **ret_groups, uint32_t *p_ngroups)
{
- int max_grp = MIN(128, groups_max());
+ int max_grp = MIN(128, getgroups_max());
gid_t stack_groups[max_grp];
uint32_t ngrp;
gid_t *temp_groups = stack_groups;
diff --git a/source3/modules/vfs_btrfs.c b/source3/modules/vfs_btrfs.c
index 789bc6d6e8a..a31b232af4d 100644
--- a/source3/modules/vfs_btrfs.c
+++ b/source3/modules/vfs_btrfs.c
@@ -460,11 +460,12 @@ static NTSTATUS btrfs_fget_compression(struct vfs_handle_struct *handle,
const char *p = NULL;
int ret;
long flags = 0;
+ int fsp_fd = fsp_get_pathref_fd(fsp);
int fd = -1;
NTSTATUS status;
if (!fsp->fsp_flags.is_pathref) {
- ret = ioctl(fd, FS_IOC_GETFLAGS, &flags);
+ ret = ioctl(fsp_fd, FS_IOC_GETFLAGS, &flags);
if (ret < 0) {
DBG_WARNING("FS_IOC_GETFLAGS failed: %s, fd %lld\n",
strerror(errno), (long long)fd);
@@ -482,9 +483,7 @@ static NTSTATUS btrfs_fget_compression(struct vfs_handle_struct *handle,
return NT_STATUS_NOT_IMPLEMENTED;
}
- fd = fsp_get_pathref_fd(fsp);
-
- p = sys_proc_fd_path(fd, buf, sizeof(buf));
+ p = sys_proc_fd_path(fsp_fd, buf, sizeof(buf));
if (p == NULL) {
return NT_STATUS_NO_MEMORY;
--
Samba Shared Repository
More information about the samba-cvs
mailing list