[SCM] Samba Shared Repository - branch master updated

2022-05-04 Thread Andrew Bartlett
The branch, master has been updated
   via  7a36b018889 dsdb: Do not reuse "ret" variable as return code and 
for memcmp() comparison
   via  2f17cbf3b29 tests/krb5: Allow passing expected etypes to get_keys()
   via  c294f729110 tests/passwords: Add tests for password history with 
simple binds
   via  08904752bba tests/passwords: Remove unused imports
   via  127fe361b83 selftest: Run some tests in the ad_dc_no_ntlm 
environment to show expected behaviour
   via  a9caf760b6f selftest: Rework password_lockout_base.py to allow 
logon_basics test to be run in ad_dc_no_ntlm
   via  f85f6f89f12 samba-tool user: Consistently return a tuple
   via  c3b2dae027e samba-tool user: Remove unused imports
   via  332b874a166 samba-tool tests: Remove unused variable
   via  5348bd80035 dsdb: Clarify that most errors in 
make_error_and_update_badPwdCount() are not returned
  from  ddeedcb6b2a gpo: Add Cert Auto Enroll Advanced Config

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 7a36b01888995031d00dbdba208fc9f522658f86
Author: Andrew Bartlett 
Date:   Thu Mar 31 21:22:08 2022 +1300

dsdb: Do not reuse "ret" variable as return code and for memcmp() comparison

Signed-off-by: Andrew Bartlett 
Reviewed-by: Joseph Sutton 

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Thu May  5 01:19:54 UTC 2022 on sn-devel-184

commit 2f17cbf3b295663a91e4facb0dc8f09ef4a77f4a
Author: Joseph Sutton 
Date:   Mon Apr 11 15:43:00 2022 +1200

tests/krb5: Allow passing expected etypes to get_keys()

Signed-off-by: Joseph Sutton 
Reviewed-by: Andrew Bartlett 

commit c294f729110f59b68c567bfe2b6da3a297a829a9
Author: Joseph Sutton 
Date:   Mon Apr 11 16:43:42 2022 +1200

tests/passwords: Add tests for password history with simple binds

Signed-off-by: Joseph Sutton 
Reviewed-by: Andrew Bartlett 

commit 08904752bba49039cf90534e6285defa17d23a0b
Author: Joseph Sutton 
Date:   Mon Apr 11 16:37:10 2022 +1200

tests/passwords: Remove unused imports

Signed-off-by: Joseph Sutton 
Reviewed-by: Andrew Bartlett 

commit 127fe361b83326d351944f9d641d75a5cee9deaa
Author: Andrew Bartlett 
Date:   Thu Mar 31 21:16:03 2022 +1300

selftest: Run some tests in the ad_dc_no_ntlm environment to show expected 
behaviour

Signed-off-by: Andrew Bartlett 
Reviewed-by: Joseph Sutton 

commit a9caf760b6f952461ecd4894b0cab1c2648f1e96
Author: Andrew Bartlett 
Date:   Thu Mar 31 22:45:40 2022 +1300

selftest: Rework password_lockout_base.py to allow logon_basics test to be 
run in ad_dc_no_ntlm

We need to ensure that even if NTLM is disabled, that the test
can still bootstrap and fail normally.

Signed-off-by: Andrew Bartlett 
Reviewed-by: Joseph Sutton 

commit f85f6f89f128882d96ba0613dc7647f00100e8d3
Author: Joseph Sutton 
Date:   Mon Apr 11 11:50:53 2022 +1200

samba-tool user: Consistently return a tuple

We would get an error when get_userPassword_hash() returned None, as
get_virtual_crypt_value() would try to unpack the result as a 2-element
tuple.

Signed-off-by: Joseph Sutton 
Reviewed-by: Andrew Bartlett 

commit c3b2dae027eeb980227160ab7ded7fe108b0ea14
Author: Joseph Sutton 
Date:   Mon Apr 11 11:50:25 2022 +1200

samba-tool user: Remove unused imports

Signed-off-by: Joseph Sutton 
Reviewed-by: Andrew Bartlett 

commit 332b874a1665c0f3003bacfb3a3b28d55677cf74
Author: Joseph Sutton 
Date:   Mon Apr 11 13:15:23 2022 +1200

samba-tool tests: Remove unused variable

Signed-off-by: Joseph Sutton 
Reviewed-by: Andrew Bartlett 

commit 5348bd80035025e91158088db8efdea971b70557
Author: Andrew Bartlett 
Date:   Fri Apr 1 12:06:45 2022 +1300

dsdb: Clarify that most errors in make_error_and_update_badPwdCount() are 
not returned

This is mainly just to be clear, and was done while failing to work around 
compiler
warnings.

For the curious it was gcc version 4.8.5 20150623 (Red Hat 4.8.5-44) 
(CentOS 7)
build with -O3, which gave with other, later patches:

../../source4/dsdb/samdb/ldb_modules/password_hash.c: In function 
‘check_password_restrictions_and_log’:
../../source4/dsdb/samdb/ldb_modules/password_hash.c:3231:5: error: 
assuming signed overflow does not occur when simplifying conditional to 
constant [-Werror=strict-overflow]
  if (ret == LDB_SUCCESS) {
 ^

Regardless, we make it clear that all values assigned to "ret" are
local small constants.

Signed-off-by: Andrew Bartlett 
Reviewed-by: Joseph Sutton 

---

Summary of changes:
 python/samba/netcmd/user.py|   8 +-
 python/samba/tests/krb5/kdc_base_test.py   |   7 +-
 python/samba/tests/krb5/protected_users_tes

[SCM] Samba Shared Repository - branch master updated

2022-05-04 Thread Andrew Bartlett
The branch, master has been updated
   via  cc606c7c786 s3:tests: Reformat test_durable_handle_reconnect.sh
   via  7366bd11783 s3:tests: Reformat test_dropbox.sh
   via  4d79f8e1582 s3:tests: Reformat test_dfree_quota.sh
   via  fcbcfc8653a s3:tests: Reformat test_dfree_command.sh
   via  cdecce9c073 s3:tests: Reformat test_delete_veto_files_only_rmdir.sh
  from  7a36b018889 dsdb: Do not reuse "ret" variable as return code and 
for memcmp() comparison

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit cc606c7c786d38672c7472aa68441197014e6de2
Author: Andreas Schneider 
Date:   Fri Apr 22 15:34:08 2022 +0200

s3:tests: Reformat test_durable_handle_reconnect.sh

shfmt -f source3/script/| xargs shfmt -w -p -i 0 -fn

Signed-off-by: Andreas Schneider 
Reviewed-by: Andrew Bartlett 

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Thu May  5 03:42:13 UTC 2022 on sn-devel-184

commit 7366bd117831c1043b986dd08ec3a0c7b8486cca
Author: Andreas Schneider 
Date:   Fri Apr 22 15:34:08 2022 +0200

s3:tests: Reformat test_dropbox.sh

shfmt -f source3/script/| xargs shfmt -w -p -i 0 -fn

Signed-off-by: Andreas Schneider 
Reviewed-by: Andrew Bartlett 

commit 4d79f8e15821152bb2c8f33d270432be70cea577
Author: Andreas Schneider 
Date:   Fri Apr 22 15:34:08 2022 +0200

s3:tests: Reformat test_dfree_quota.sh

shfmt -f source3/script/| xargs shfmt -w -p -i 0 -fn

Signed-off-by: Andreas Schneider 
Reviewed-by: Andrew Bartlett 

commit fcbcfc8653a00fe148f436b6c3a31aa700e13f8a
Author: Andreas Schneider 
Date:   Fri Apr 22 15:34:08 2022 +0200

s3:tests: Reformat test_dfree_command.sh

shfmt -f source3/script/| xargs shfmt -w -p -i 0 -fn

Signed-off-by: Andreas Schneider 
Reviewed-by: Andrew Bartlett 

commit cdecce9c073eb7730d103d4420e50512d668d334
Author: Andreas Schneider 
Date:   Fri Apr 22 15:34:08 2022 +0200

s3:tests: Reformat test_delete_veto_files_only_rmdir.sh

shfmt -f source3/script/| xargs shfmt -w -p -i 0 -fn

Signed-off-by: Andreas Schneider 
Reviewed-by: Andrew Bartlett 

---

Summary of changes:
 .../tests/test_delete_veto_files_only_rmdir.sh | 217 ++--
 source3/script/tests/test_dfree_command.sh |  29 +--
 source3/script/tests/test_dfree_quota.sh   | 222 +++--
 source3/script/tests/test_dropbox.sh   |  94 -
 .../script/tests/test_durable_handle_reconnect.sh  |  14 +-
 5 files changed, 290 insertions(+), 286 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/tests/test_delete_veto_files_only_rmdir.sh 
b/source3/script/tests/test_delete_veto_files_only_rmdir.sh
index d2c3b2198f7..08f257ff8a6 100755
--- a/source3/script/tests/test_delete_veto_files_only_rmdir.sh
+++ b/source3/script/tests/test_delete_veto_files_only_rmdir.sh
@@ -5,10 +5,10 @@
 #
 
 if [ $# -lt 6 ]; then
-cat < "$tmpfile" <"$tmpfile" < "$tmpfile" <"$tmpfile" < "$tmpfile" <"$tmpfile" < "$tmpfile" <"$tmpfile" <&1)
status=$?
@@ -50,17 +51,17 @@ test_smbclient_dfree() {
 }
 
 if [ $protocol = "SMB3" ]; then
-   test_smbclient_dfree "Test dfree command share root SMB3" dfree "l" 
"2000 1024. 20" -U$USERNAME%$PASSWORD --option=clientmaxprotocol=SMB3 || 
failed=`expr $failed + 1`
-   test_smbclient_dfree "Test dfree command subdir1 SMB3" dfree "cd 
subdir1; l" "8000 1024. 80" -U$USERNAME%$PASSWORD 
--option=clientmaxprotocol=SMB3 || failed=`expr $failed + 1`
-   test_smbclient_dfree "Test dfree command subdir2 SMB3" dfree "cd 
subdir2; l" "32000 1024. 320" -U$USERNAME%$PASSWORD 
--option=clientmaxprotocol=SMB3 || failed=`expr $failed + 1`
+   test_smbclient_dfree "Test dfree command share root SMB3" dfree "l" 
"2000 1024. 20" -U$USERNAME%$PASSWORD --option=clientmaxprotocol=SMB3 || 
failed=$(expr $failed + 1)
+   test_smbclient_dfree "Test dfree command subdir1 SMB3" dfree "cd 
subdir1; l" "8000 1024. 80" -U$USERNAME%$PASSWORD 
--option=clientmaxprotocol=SMB3 || failed=$(expr $failed + 1)
+   test_smbclient_dfree "Test dfree command subdir2 SMB3" dfree "cd 
subdir2; l" "32000 1024. 320" -U$USERNAME%$PASSWORD 
--option=clientmaxprotocol=SMB3 || failed=$(expr $failed + 1)
 
 elif [ $protocol = "NT1" ]; then
-   test_smbclient_dfree "Test dfree command share root NT1" dfree "l" 
"2000 1024. 20" -U$USERNAME%$PASSWORD --option=clientmaxprotocol=NT1 || 
failed=`expr $failed + 1`
-#SMB1 queries disk usage stat on the share's root, regardless of working 
directory
-   test_smbclient_dfree "Test dfree command subdir1 NT1" dfree "cd 
subdir1; l" "2000 1024. 20" -U$USERNAME%$PASSWORD 
--option=clientmaxprotocol=NT1 || failed=`expr $failed + 1`
+   test_smbclient_dfree "Test dfree command share root NT1" dfree "l