[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c4e576052fa s4-samr: Fix missing check for GnuTLS errors from
E_old_pw_hash()
via 8a91ffa6bd6 fuzz: add lzxpress compress/decompress round-trip
via 6c9fd8fbdbe fuzz: add fuzz_lzxpress_compress
via 505d2879fa8 compression:tests: align test names with functions
via 05c760165bf compression: add a few comments, including MS-XCA
pointers.
via 383a7cfed98 compression: remove always false constant comparison
via e36cb10b162 compression: lzxpress decompress empty string as empty
string
via 1ca44492941 compression: fix lzxpress decompress with trailing flags
via d8a90d2a8fc compression:tests: test lzxpress in some edge cases
via 075df819cce compression: Move maximum length calculation out of
inner loop
via 877f007f32d compression: Use correct values for max len and offset
via fe5fa7e1974 compression: Replace divisions with shifts
via 131eb752699 compression: Remove unneeded loop variable
via 5b1f8ea8d3e compression: Reduce scope of variables
via 1a964210d24 compression: Use PUSH_LE_U32 for first output buffer
write
via 41b88d35ce6 compression: Add bounds check for first output buffer
write
via 0c813ee5637 compression: Remove helper variables str1 and str2
via 430bcd7a083 compression: Fix writing output flags
via bb9115e023b compression: Remove byte_left variable
via 417e0c914fd compression: Remove redundant bounds check
via 6f3f1ba5b4d compression: Add range check for indic_pos
via b62fbc4a535 compression: Remove redundant nibble_index check
via 52982c01a59 compression: Make use of PUSH_LE_Uxx macros
via f2ea8d4c056 compression: Simplify code by making indic_pos an index
via b1534457982 compression: Make use of CHECK_{IN,OUT}PUT_BYTES macros
via ea42717ccae compression: Simplify code by removing metadata_size
variable
via 69244b52ed4 compression: Use correct value for indic_pos
via 7fab9f90e8a compression: Use correct value for nibble_index
via f8feac11cbb compression: Simplify redundant branches
via d368fa61cfc compression: Consistently use PUSH_LE_Uxx macros
via 9516b268458 compression: Use explicit data sizes
via eb7f139dec0 compression tests: Add additional compression tests
via 3c2f1f03c19 compression: fix lzxpress-compress
via 8f7fbc5c8fd compression: lzxpress_compress: fix no-op shift of 0
via a8fb45247ba compression: fix lzxpress_decompress
via f67ff611e96 compression tests: add test for legacy compressed data
via 4bcdc3bf30a compression tests: add LZXpress tests based on [MS-XCA]
via eddefe3c62a util/base64: decode_data_blob_talloc catches talloc
error
from be2e2044b8e s3: libsmbclient: Cope with SMB2 servers that return
STATUS_USER_SESSION_DELETED on a SMB2_ECHO (SMB2_OP_KEEPALIVE) call with a NULL
session.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c4e576052fa9bc57d288bed69abb599e1f9bb27b
Author: Andrew Bartlett
Date: Thu May 12 10:54:22 2022 +1200
s4-samr: Fix missing check for GnuTLS errors from E_old_pw_hash()
Not likely to be an issue in the real world as the earlier calls
will have failed if weak crypto was disabled, but this was missed
in dce944e8a1119034f184336f6b71a28080152a0a.
Signed-off-by: Andrew Bartlett
Reviewed-by: Douglas Bagnall
Autobuild-User(master): Andrew Bartlett
Autobuild-Date(master): Thu May 12 03:18:42 UTC 2022 on sn-devel-184
commit 8a91ffa6bd64746358faf8661649c33f683759ef
Author: Douglas Bagnall
Date: Wed May 11 12:08:54 2022 +1200
fuzz: add lzxpress compress/decompress round-trip
We say it is an error to end up at a different result.
Signed-off-by: Douglas Bagnall
Reviewed-by: Andrew Bartlett
commit 6c9fd8fbdbecc47e0595d3606bccf7d143b01b61
Author: Douglas Bagnall
Date: Wed May 11 12:08:06 2022 +1200
fuzz: add fuzz_lzxpress_compress
Signed-off-by: Douglas Bagnall
Reviewed-by: Andrew Bartlett
commit 505d2879fa813796bf16af27615f0984bc71ad36
Author: Douglas Bagnall
Date: Wed May 11 17:21:46 2022 +1200
compression:tests: align test names with functions
You'll thank me if you're ever debugging these and wondering why
'lzxpress4' calls 'lzxpress2' (or is it the other way round?).
Signed-off-by: Douglas Bagnall
Reviewed-by: Andrew Bartlett
commit 05c760165bffa246b724d1471e307c488171b749
Author: Douglas Bagnall
Date: Wed May 11 16:20:46 2022 +1200
compression: add a few comments, including MS-XCA pointers.
Signed-off-by: Douglas Bagnall
Reviewed-by: Andrew Bartlett
commit 383a7cfed9856b9057f2e56a1a26b8d4247ebbb6
Author: Douglas Bagnall
Date: Wed May 11 10:25:13 2022
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via be2e2044b8e s3: libsmbclient: Cope with SMB2 servers that return
STATUS_USER_SESSION_DELETED on a SMB2_ECHO (SMB2_OP_KEEPALIVE) call with a NULL
session.
from 0b214d666a9 gitignore: Add .ropeproject for pylsp-rope plugin
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit be2e2044b8ef56112162a42ac19b3791c787916b
Author: Jeremy Allison
Date: Wed Dec 11 15:06:40 2019 -0800
s3: libsmbclient: Cope with SMB2 servers that return
STATUS_USER_SESSION_DELETED on a SMB2_ECHO (SMB2_OP_KEEPALIVE) call with a NULL
session.
This is already tested by smb2.session.expire which
shows that Windows and Samba servers don't need this,
but some third party server are returning STATUS_USER_SESSION_DELETED
with a NULL sessionid.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13218
Signed-off-by: Jeremy Allison
Reviewed-by: Bjoern Jacke
Autobuild-User(master): Björn Jacke
Autobuild-Date(master): Wed May 11 18:06:42 UTC 2022 on sn-devel-184
---
Summary of changes:
source3/libsmb/libsmb_server.c | 21 -
1 file changed, 20 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index 09d27868c0e..ce17e4fed09 100644
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -61,14 +61,33 @@ SMBC_check_server(SMBCCTX * context,
1,
data_blob_const(data, sizeof(data)));
if (!NT_STATUS_IS_OK(status)) {
+ bool ok = false;
+ /*
+* Some SMB2 servers (not Samba or Windows)
+* check the session status on SMB2_ECHO and return
+* NT_STATUS_USER_SESSION_DELETED
+* if the session was not set. That's OK, they still
+* replied.
+* BUG: https://bugzilla.samba.org/show_bug.cgi?id=13218
+*/
+ if (smbXcli_conn_protocol(server->cli->conn) >=
+ PROTOCOL_SMB2_02) {
+ if (NT_STATUS_EQUAL(status,
+ NT_STATUS_USER_SESSION_DELETED)) {
+ ok = true;
+ }
+ }
/*
* Some NetApp servers return
* NT_STATUS_INVALID_PARAMETER.That's OK, they still
* replied.
* BUG: https://bugzilla.samba.org/show_bug.cgi?id=13007
*/
- if (!NT_STATUS_EQUAL(status,
+ if (NT_STATUS_EQUAL(status,
NT_STATUS_INVALID_PARAMETER)) {
+ ok = true;
+ }
+ if (!ok) {
return 1;
}
}
--
Samba Shared Repository
