sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code
133,654 Commits 60 Branches 1,145 Tags 452 MiB
f3714a3e3a
Commit Graph

920 Commits

Author SHA1 Message Date
Stefan Metzmacher
91eb3f1d22 testprogs/blackbox: add --recursive tests to test_samba-tool_ntacl.sh 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Jun 22 00:22:47 UTC 2023 on atb-devel-224
 2023-06-22 00:22:47 +00:00
Stefan Metzmacher
11741791cc testprogs/blackbox: move 'ntacl get' out of test_changedomsid() in test_samba-tool_ntacl.sh 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-06-21 23:24:37 +00:00
Stefan Metzmacher
619f097b7d testprogs/blackbox: pass $CONFIGURATION to test_samba-tool_ntacl.sh 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-06-21 23:24:37 +00:00
Stefan Metzmacher
c95813374a testprogs/blackbox: also raise the levels to 2012_R2/2016 in functionalprep.sh 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-06-21 19:08:37 +00:00
Stefan Metzmacher
d2777d47d1 testprogs/blackbox: also prepare for to 2016 (schema=2019) in functionalprep.sh 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-06-21 19:08:37 +00:00
Andreas Schneider
457a83e7ab testprogs: Do not export UID_WRAPPER_ROOT in test_kpasswd_heimdal.sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-06-16 20:28:30 +00:00
Andreas Schneider
b41ff81a78 testprogs: Do not export UID_WRAPPER_ROOT in test_kpasswd_mit.sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-06-16 20:28:29 +00:00
Andreas Schneider
ea566a825a testprogs: Do not export UID_WRAPPER_ROOT in test_pdbtest.sh 
We already set root for smbpasswd.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-06-16 20:28:29 +00:00
Andreas Schneider
579182372a testprogs: Do not export UID_WRAPPER_ROOT in test_net_ads_dns.sh 
There is not need for root here.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-06-16 20:28:29 +00:00
Andreas Schneider
1fb0b3684e testprogs: Do not export UID_WRAPPER_ROOT in test_samba-tool_ntacl.sh 
There is not need for root here.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-06-16 20:28:29 +00:00
Andreas Schneider
3b612dc64a testprogs:subunit: Fix integer comparisons 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-06-16 20:28:29 +00:00
Andreas Schneider
e4b77dc38b testprogs:subunit: Fix assigning an array to a string 
$@ is an array and we want a string.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-06-16 20:28:29 +00:00
Pavel Filipenský
076d852467 testprogs: Add test_alias_membership 
Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
 2023-06-13 12:15:32 +00:00
Noel Power
d36bab52d0 s3/utils: when encoding ace string use "FA", "FR", "FW", "FX" string rights 
prior to this patch rights matching "FA", "FR", "FW", "FX" were
outputted as the hex string representing the bit value.

While outputting the hex string is perfectly fine, it makes it harder
to compare icacls output (which always uses the special string values)

Additionally adjust various tests to deal with use of shortcut access masks
as sddl format now uses FA, FR, FW & FX strings (like icalcs does) instead
of hex representation of the bit mask.

adjust
  samba4.blackbox.samba-tool_ntacl
  samba3.blackbox.large_acl
  samba.tests.samba_tool.ntacl
  samba.tests.ntacls
  samba.tests.posixacl

so various string comparisons of the sddl format now pass

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

[abartlet@samba.org Adapted to new stricter SDDL behaviour around leading zeros in hex
 numbers, eg 0x001]
 2023-04-28 02:15:36 +00:00
Douglas Bagnall
75a089dc46 test:bb/samba-tool ntacl: let return acl flag lack hex padding 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-28 02:15:36 +00:00
Pavel Filipenský
31418f95d3 testprogs: Set PREFIX_ABS before it is used in test_primary_group.sh 
Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Apr 14 06:18:18 UTC 2023 on atb-devel-224
 2023-04-14 06:18:18 +00:00
Joseph Sutton
f407b3ec0d testprogs: Return correct status code 
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
 2023-04-12 13:52:32 +00:00
Joseph Sutton
23d2c9cb72 testprogs: Make test_rpcclient_expect_failure_grep() return 0 on success 
This is more consistent with the behaviour of the other expect_failure
functions.

Adjust all callers expecting the opposite behaviour to match.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
 2023-04-12 13:52:32 +00:00
Joseph Sutton
dfb088aaed testprogs: Return correct status code 
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
 2023-04-12 13:52:32 +00:00
Joseph Sutton
b62b0bd64b testprogs: Make test_smbclient_expect_failure() return 0 on success 
This is the behaviour that most existing callers expect, but the
function actually returns a non-zero status code in that case.

Adjust all callers expecting the opposite behaviour to match.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
 2023-04-12 13:52:32 +00:00
Joseph Sutton
833cefe8ee testprogs: Make testit_expect_failure() return 0 on success 
This is the behaviour that most existing callers expect, but the
function actually returns a non-zero status code in that case.

Adjust all callers expecting the opposite behaviour to match.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
 2023-04-12 13:52:32 +00:00
Joseph Sutton
b1df85e7d3 testprogs: Fix comparison 
SC2039: In POSIX sh, == in place of = is undefined.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
 2023-04-12 13:52:32 +00:00
Andreas Schneider
484bf9c49a testprogs: Remove unused test_export_keytab_(heimdal|mit).sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Apr  6 14:47:20 UTC 2023 on atb-devel-224
 2023-04-06 14:47:20 +00:00
Andreas Schneider
d9a9cb0396 testprogs: Merge export keytab tests into a single script for MIT and Heimdal 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
deb9d1f656 testprogs: Fix shell arithmetic in test_export_keytab_mit.sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
245990998f testprogs: Reformat test_export_keytab_mit.sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
e560cf8ae1 testprogs: Fix shell arithmetic in test_export_keytab_heimdal.sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
0b21e492c5 testprogs: Reformat test_export_keytab_heimdal.sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
51cebd4ba6 testprogs: Remove unused test_kinit_trusts_(heimdal|mit).sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
f18ca8a5c8 testprogs: Merge kinit trust tests into a single script for MIT and Heimdal 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
cbf756bb01 testprogs: Fix shell arithmetic in test_kinit_trusts_heimdal.sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
01b1dd8f7b testprogs: Fix shell arithmetic in test_kinit_trusts_mit.sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
ccce9d3fb3 testprogs: Reformat test_kinit_trusts_mit.sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
58ca14845c testprogs: Reformat test_kinit_trusts_heimdal.sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
f7402c3400 testprogs: Remove unused test_kinit_(heimdal|mit).sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
de8a0ee020 testprogs: Merge kinit tests into a single script for MIT and Heimdal 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
3d63419f92 testprogs: Fix shell arithmetic in test_kinit_mit.sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
deff466648 testprogs: Reformat test_kinit_mit.sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
715f7c46b9 testprogs: Use common binary detection functions in test_kinit_heimdal.sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
aea8611b39 testprogs: Fix shell arithmetic in test_kinit_heimdal.sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
c5bf365d92 testprogs: Reformat test_kinit_heimdal.sh 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
f91f042c1d testprogs: Pass configuration to test_kinit_trusts_mit.sh 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
4ea94c8eaa testprogs: Pass configuration to test_kinit_trusts_heimdal.sh 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
3b78011213 testprogs: Remove UID_WRAPPER_ROOT export 
This is not needed, we only need it for smbpasswd and in order to get
root we need to set the ruid and euid, which we already do.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
9e7de6dff6 testprogs: Pass configuration to test_password_settings.sh 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
41b4a2a252 testprogs: Pass configuration to test_kpasswd_mit.sh 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
9e949bc403 testprogs: Pass configuration to test_kpasswd_heimdal.sh 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
62cfab55e6 testprogs: Specify the KRB5CCNAME on the command line 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
d2bd1e3409 testprogs: Pass configuration to test_export_keytab_mit.sh 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00
Andreas Schneider
ff77e910bc testprogs: Pass configuration to test_export_keytab_heimdal.sh 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2023-04-06 13:45:35 +00:00