[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ef5d79e24ba pidl/tests/samba-ndr.pl: remove duplicate import
via fbe402edf55 pidl s4::Python: silence warnings
via 51a11afecf5 pidl Parse::Pidl::NDR: silence two warnings about
undefined strings
via 3c90c9de6f4 pidl Parse::Pidl::NDR: add HRESULT alignment
via 33255102acd pidl Parse::Pidl::NDR: warn of unknown scalar alignments
via 4de002a0f77 pidl s4::NDR::Parser: silence a warning
via aefce8e7c0d pidl s4::NDR::Parser: correct has_fast_array logic
via 2765b5c1a27 pidl s4::NDR::Parser: read hex numbers as numbers for
ranges
via efef4366f18 pidl: use perl warnings
via b6913830bf6 librpc/ndr: Do not follow a client-supplied NULL
pointer in _print_drsuapi_DsAttributeValue_attid()
via f786cdf5e84 selftest: Add ndrdump tests for malformed drsuapi
traffic
from 83ffe6752d5 pidl: Remove Parse/Yapp/Driver.pm
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ef5d79e24ba8aec226419e594de0cf91c24d7fc4
Author: Douglas Bagnall
Date: Sun Dec 1 00:44:52 2019 +1300
pidl/tests/samba-ndr.pl: remove duplicate import
Signed-off-by: Douglas Bagnall
Reviewed-by: Andrew Bartlett
Autobuild-User(master): Andrew Bartlett
Autobuild-Date(master): Tue Dec 10 04:16:31 UTC 2019 on sn-devel-184
commit fbe402edf55cc4dda8820645c7c4e20862969803
Author: Douglas Bagnall
Date: Sun Dec 1 00:43:52 2019 +1300
pidl s4::Python: silence warnings
- do not redeclare variables in the same scope.
- use $1 instead of \1, which perl just prefers.
Signed-off-by: Douglas Bagnall
Reviewed-by: Andrew Bartlett
commit 51a11afecf590a26b784c1d2e484829330efa44f
Author: Douglas Bagnall
Date: Sun Dec 1 00:43:02 2019 +1300
pidl Parse::Pidl::NDR: silence two warnings about undefined strings
Signed-off-by: Douglas Bagnall
Reviewed-by: Andrew Bartlett
commit 3c90c9de6f45af60d9db5f40ec0dad6318e53e3d
Author: Douglas Bagnall
Date: Sun Dec 1 00:42:22 2019 +1300
pidl Parse::Pidl::NDR: add HRESULT alignment
this is a guess
Signed-off-by: Douglas Bagnall
Reviewed-by: Andrew Bartlett
commit 33255102acd755cacceafd2a082722ed0fbc695f
Author: Douglas Bagnall
Date: Sun Dec 1 00:41:42 2019 +1300
pidl Parse::Pidl::NDR: warn of unknown scalar alignments
Signed-off-by: Douglas Bagnall
Reviewed-by: Andrew Bartlett
commit 4de002a0f77dba8345ca6c395a855a5c053a8dd4
Author: Douglas Bagnall
Date: Sat Nov 30 23:05:56 2019 +1300
pidl s4::NDR::Parser: silence a warning
At level 0 there is no previous level so $pl is undefined thus so is
->{TYPE}
Signed-off-by: Douglas Bagnall
Reviewed-by: Andrew Bartlett
commit aefce8e7c0d82241ab6ecfab7d714338b331bc52
Author: Douglas Bagnall
Date: Sat Nov 30 22:52:23 2019 +1300
pidl s4::NDR::Parser: correct has_fast_array logic
Here we fix two bugs that cancelled each other out completely, so this
patch leaves us with exactly the same functionally as before.
Bug 1: In perl, return is *syntactically* a function.
That means 'return X or Y' is read as 'return(X) or Y', as in the
'open(X) or die "..."' construct -- Y is only evaluated if return
returns false. But return never returns, so Y is dead code. If in
doubt, try these:
perl -e "sub x {return 0 or die;} x"
perl -e "sub x {return (0 or die);} x"
What we *meant* here is 'return (X or Y)', BUT it turns out we were
confused -- the Y case was bogus.
Bug 2: string arrays never had "fast array logic" in the first place.
The fast array logic is for arrays of bytes, and can be fast (i.e.
memcpy) because there is no endianness to worry about. A string array
is an array of pointers not bytes.
Signed-off-by: Douglas Bagnall
Reviewed-by: Andrew Bartlett
commit 2765b5c1a27232b990537415718e98449617641b
Author: Douglas Bagnall
Date: Sat Nov 30 23:37:08 2019 +1300
pidl s4::NDR::Parser: read hex numbers as numbers for ranges
Hex numbers in IDL are not parsed as numbers, resulting in warnings
like
Argument 0x2000 isn't numeric in numeric lt (<) at
/home/douglas/src/samba/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm line 981
not to mention problematic code. We add a utility function to convert
these numbers to numbers.
A typical difference this makes is:
--- old/default/librpc/gen_ndr/ndr_dcerpc.c 2019-11-30
23:40:32.915816967 +1300
+++ new/default/librpc/gen_ndr/ndr_dcerpc.c 2019-11-30
17:00:09.055733660 +1300
@@ -1893,7 +1893,7 @@
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
>ReceiveWindowSize));
-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 83ffe6752d5 pidl: Remove Parse/Yapp/Driver.pm via fe2577a40c1 smbdes: remove old unused DES builtin-crypto via b5d8f1f78a0 sess_crypt_blob can only crypt blobs whose size divides by 8 via a75ca8d5d51 session: convert sess_crypt_blob to use gnutls via dcc33103d5c smbdes: convert des_crypt112_16 to use gnutls via 254739137bd smbdes: convert des_crypt112 to use gnutls via dce944e8a11 smbdes: convert E_old_pw_hash to use gnutls via c57f4295742 smbdes: convert des_crypt128() to use gnutls via a5548af0186 smbdes: convert E_P24() and SMBOWFencrypt to use gnutls via 2eef12904f2 smbdes: remove D_P16() (not used) via 9fb6361a8b0 smbdes: convert E_P16() to use gnutls via ecee1998034 smbdes: convert sam_rid_crypt() to use gnutls via bbcf568f317 SMBsesskeygen_lm_sess_key: use gnutls and return NTSTATUS via 38189f76d8b netlogon_creds_des_encrypt/decrypt_LMKey: use gnutls and return NTSTATUS via 0f855f1ab95 smbdes: add des_crypt56_gnutls() using DES-CBC with zeroed IV via 2c470c8035b selftest: test sess_crypt_blob via 6c5f153e479 selftest: test SMBsesskeygen_lm_sess_key via a4ec427e54b selftest: test des_crypt112_16 via 394debac6b2 selftest: test des_crypt112 and fix (unused) decryption via e2f8f686d1e selftest: test des_crypt128 via 8f042ba532f selftest: test E_old_pw_hash via dfad082596a selftest: test E_P24 and SMBOWFencrypt via 0923f94bdc2 selftest: test sam_rid_crypt via 7044a41a30e selftest: test E_P16 via 07b4606f893 libcli/auth: test des_crypt56() and add test_gnutls to selftest via 01f531ba6ba auth:tests: Only enable torture_gnutls_aes_128_cfb() on GnuTLS >= 3.6.11 via 1c65f1fddba auth:tests: Improve debug output of test_gnutls via adfdcc4791b s3:lib: Move NULL check before messaging_dgm_out_rearm_idle_timer() via 8753d5f4567 s3:smbd: Fix possible NULL deref in smbd_do_qfilepathinfo() via cfa05261005 s3:torture: Do not segfault if cli is NULL via 94c3c12df11 s3:rpc_server: Fix string compare for utmp entries via c2e55821bc5 s4:lib: Make sure we close fd's in error path from bb2296f68a3 build: Fix the build without system gssapi headers https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 83ffe6752d589180eac96d7b8e7d1a54e3476bfd Author: Andreas Schneider Date: Thu Dec 5 13:48:52 2019 +0100 pidl: Remove Parse/Yapp/Driver.pm This file is provided by Parse::Yapp and on install we overwrite the orignal file. Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Tue Dec 10 01:54:02 UTC 2019 on sn-devel-184 commit fe2577a40c19c99c29dd54c7c43e12f3d43493be Author: Isaac Boukris Date: Mon Oct 21 20:03:04 2019 +0300 smbdes: remove old unused DES builtin-crypto Signed-off-by: Isaac Boukris Reviewed-by: Andrew Bartlett commit b5d8f1f78a04719c6a5d15aa92ae398be326fe56 Author: Isaac Boukris Date: Thu Nov 21 15:13:19 2019 +0100 sess_crypt_blob can only crypt blobs whose size divides by 8 Signed-off-by: Isaac Boukris Reviewed-by: Andrew Bartlett commit a75ca8d5d515aef1229acf5a30489ee5f5ced3e1 Author: Isaac Boukris Date: Thu Nov 21 14:02:03 2019 +0100 session: convert sess_crypt_blob to use gnutls Signed-off-by: Isaac Boukris Reviewed-by: Andrew Bartlett commit dcc33103d5c0927bb3757974d4663df888dce95e Author: Isaac Boukris Date: Wed Nov 20 16:02:16 2019 +0100 smbdes: convert des_crypt112_16 to use gnutls Signed-off-by: Isaac Boukris Reviewed-by: Andrew Bartlett commit 254739137bdaebca31163f1683bfd7111dfefe67 Author: Isaac Boukris Date: Wed Nov 20 15:41:02 2019 +0100 smbdes: convert des_crypt112 to use gnutls Signed-off-by: Isaac Boukris Reviewed-by: Andrew Bartlett commit dce944e8a1119034f184336f6b71a28080152a0a Author: Isaac Boukris Date: Wed Nov 20 15:28:39 2019 +0100 smbdes: convert E_old_pw_hash to use gnutls Signed-off-by: Isaac Boukris Reviewed-by: Andrew Bartlett commit c57f429574243adbcd43dca4f35d125df8d69ba0 Author: Isaac Boukris Date: Fri Nov 8 17:49:48 2019 +0100 smbdes: convert des_crypt128() to use gnutls Signed-off-by: Isaac Boukris Reviewed-by: Andrew Bartlett commit a5548af018643f2e78c482e33ef0e6073db149e4 Author: Isaac Boukris Date: Fri Nov 8 15:40:01 2019 +0100 smbdes: convert E_P24() and SMBOWFencrypt to use gnutls Signed-off-by: Isaac Boukris Reviewed-by: Andrew Bartlett commit 2eef12904f2c08257394a2ee869960f7c2e09112 Author: Isaac Boukris Date: Fri Nov 8 12:04:48 2019 +0100 smbdes: remove D_P16() (not
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via bb2296f68a3 build: Fix the build without system gssapi headers from a5e3db5b512 lib: spelling fix https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit bb2296f68a36a3b85a5702062a5e488f9d6616dc Author: Volker Lendecke Date: Mon Dec 9 13:49:47 2019 +0100 build: Fix the build without system gssapi headers source4/heimdal/lib/gssapi/gssapi/gssapi_krb5.h and gssapi_spnego.h have an #include which they need to find via the -I paths Signed-off-by: Volker Lendecke Reviewed-by: Richard Sharpe Reviewed-by: Martin Schwenke Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Tue Dec 10 00:29:55 UTC 2019 on sn-devel-184 --- Summary of changes: buildtools/wafsamba/samba3.py | 1 + 1 file changed, 1 insertion(+) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index 3bb2c521a2c..7b42075d1ab 100644 --- a/buildtools/wafsamba/samba3.py +++ b/buildtools/wafsamba/samba3.py @@ -40,6 +40,7 @@ def s3_fix_kwargs(bld, kwargs): extra_includes += [ '../source4/heimdal/lib/com_err', '../source4/heimdal/lib/krb5', '../source4/heimdal/lib/gssapi', +'../source4/heimdal/lib/gssapi/gssapi', '../source4/heimdal_build/include', '../bin/default/source4/heimdal/lib/asn1' ] -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a5e3db5b512 lib: spelling fix from f2a91426b79 smbd: Give a better error message for non-existing share modes https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a5e3db5b5125c2f9921a51837ac8d696b8f4260e Author: Ralph Boehme Date: Mon Dec 9 18:56:59 2019 +0100 lib: spelling fix Signed-off-by: Ralph Boehme Reviewed-by: Richard Sharpe Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Mon Dec 9 19:23:10 UTC 2019 on sn-devel-184 --- Summary of changes: lib/util/time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/lib/util/time.h b/lib/util/time.h index dfb86b45a88..4a90b40d5ce 100644 --- a/lib/util/time.h +++ b/lib/util/time.h @@ -43,7 +43,7 @@ /* * According to Windows API FileTimeToSystemTime() documentation the highest - * allows value " ... must be less than 0x8000.". + * allowed value " ... must be less than 0x8000.". */ #define NTTIME_MAX INT64_MAX -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f2a91426b79 smbd: Give a better error message for non-existing
share modes
via b6ffbc7d923 net: Extend some debug information
via 37fa97b20e3 smbd: Call reopen_logs() in the notifyd
via 27c69b58929 smbd: Call reopen_logs() in the smbd scavenger
via a34d75f6f7e torture: Use sizeof() where appropriate
via f576c02bf93 smbd: Use NULL instead of 0 for a pointer type
via e1230f6e45b lib: add a comment to nt_time_to_full_timespec()
via f0813cbf4f5 lib: harden full_timespec_to_nt_time()
via 99d153fad12 lib: add NTTIME_MAX, NTTIME_MIN, NTTIME_OMIT and
NTTIME_FREEZE definitions
from 67f455c3d57 s3:smbspool: Leave early if we print as root
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f2a91426b791d1fc1b1655dfd4b8af5d50142d08
Author: Volker Lendecke
Date: Tue Dec 3 21:26:24 2019 +0100
smbd: Give a better error message for non-existing share modes
Signed-off-by: Volker Lendecke
Reviewed-by: Ralph Boehme
Autobuild-User(master): Ralph Böhme
Autobuild-Date(master): Mon Dec 9 17:33:42 UTC 2019 on sn-devel-184
commit b6ffbc7d923cbe8c51a02e70d7ea8d2b8035b10e
Author: Volker Lendecke
Date: Fri Nov 29 15:45:56 2019 +0100
net: Extend some debug information
Signed-off-by: Volker Lendecke
Reviewed-by: Ralph Boehme
commit 37fa97b20e30c13cd59f2a58f61d09a3ff761ac4
Author: Volker Lendecke
Date: Tue Dec 3 13:23:06 2019 +0100
smbd: Call reopen_logs() in the notifyd
If you have per-process logfiles with %d, the notifyd will get its
own logfile
Signed-off-by: Volker Lendecke
Reviewed-by: Ralph Boehme
commit 27c69b58929ea45bd7108372468cf6c63b80c449
Author: Volker Lendecke
Date: Tue Dec 3 13:22:06 2019 +0100
smbd: Call reopen_logs() in the smbd scavenger
If you have per-process logfiles with %d, the scavenger will get its
own logfile
Signed-off-by: Volker Lendecke
Reviewed-by: Ralph Boehme
commit a34d75f6f7e56a76b4e3d5399742e5ac837bafdd
Author: Volker Lendecke
Date: Tue Dec 3 12:52:09 2019 +0100
torture: Use sizeof() where appropriate
One magic number less that needs to be verified manually
Signed-off-by: Volker Lendecke
Reviewed-by: Ralph Boehme
commit f576c02bf9365ff538a46dadfe8ce1f1aa19664c
Author: Volker Lendecke
Date: Wed Dec 4 14:43:02 2019 +0100
smbd: Use NULL instead of 0 for a pointer type
Signed-off-by: Volker Lendecke
Reviewed-by: Ralph Boehme
commit e1230f6e45bb076af9f6efda04405b0874430681
Author: Ralph Boehme
Date: Fri Dec 6 16:48:19 2019 +
lib: add a comment to nt_time_to_full_timespec()
Add a hint explaining why and how -1 should be treated differently in the
future. Also make use of the helper function make_omit_timespec().
Signed-off-by: Ralph Boehme
Reviewed-by: Stefan Metzmacher
commit f0813cbf4f507462b5b9aa0e913483232e51bea5
Author: Ralph Boehme
Date: Fri Dec 6 16:45:04 2019 +
lib: harden full_timespec_to_nt_time()
This protects against overflows when tv_sec is less then
TIME_FIXUP_CONSTANT_INT.
It also correctly limits the range of returned values to be
[NTTIME_MIN, NTTIME_MAX].
Signed-off-by: Ralph Boehme
Reviewed-by: Stefan Metzmacher
commit 99d153fad120e0a9335ec474296f55a2e258561a
Author: Ralph Boehme
Date: Fri Dec 6 16:44:37 2019 +
lib: add NTTIME_MAX, NTTIME_MIN, NTTIME_OMIT and NTTIME_FREEZE definitions
Signed-off-by: Ralph Boehme
Reviewed-by: Stefan Metzmacher
---
Summary of changes:
lib/util/time.c| 44 ++
lib/util/time.h| 23 ++
source3/locking/share_mode_lock.c | 3 +++
source3/smbd/scavenger.c | 2 ++
source3/smbd/server.c | 4 +++-
source3/utils/net_tdb.c| 4 +++-
source4/torture/smb2/durable_v2_open.c | 4 +++-
7 files changed, 71 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/time.c b/lib/util/time.c
index 0875c9fbda9..0fac5e2e397 100644
--- a/lib/util/time.c
+++ b/lib/util/time.c
@@ -1080,23 +1080,37 @@ struct timespec make_omit_timespec(void)
* Like unix_timespec_to_nt_time() but without the special casing of tv_sec=0
* and -1. Also dealing with SAMBA_UTIME_OMIT.
**/
-NTTIME full_timespec_to_nt_time(const struct timespec *ts)
+NTTIME full_timespec_to_nt_time(const struct timespec *_ts)
{
+ struct timespec ts = *_ts;
uint64_t d;
- if (ts->tv_sec == TIME_T_MAX) {
- return 0x7fffLL;
+ if (is_omit_timespec(_ts)) {
+ return NTTIME_OMIT;
}
-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 67f455c3d57 s3:smbspool: Leave early if we print as root
via c95d32f685d s3:smbspool: print a hint about smbspool_krb5_wrapper
via 58a90358e2e s3:smbspool_krb5_wrapper: ignore unknown values of
AUTH_INFO_REQUIRED
via 6201b30421f s3:smbspool_krb5_wrapper: Map AUTH_INFO_REQUIRED=none
to anonymous
via 1b42ccfc23e s3:smbspool: Map AUTH_INFO_REQUIRED=none to anonymous
connection
from 8987d7eef4f s3:selfest: Do not print the env twice
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 67f455c3d576a0bc3174fd10cf4f3244621b6b13
Author: Andreas Schneider
Date: Fri Nov 29 08:28:28 2019 +0100
s3:smbspool: Leave early if we print as root
Signed-off-by: Andreas Schneider
Reviewed-by: Guenther Deschner
Autobuild-User(master): Günther Deschner
Autobuild-Date(master): Mon Dec 9 14:18:11 UTC 2019 on sn-devel-184
commit c95d32f685d989c91e62a734229d2bd241291315
Author: Mikhail Novosyolov
Date: Sun Nov 3 01:47:51 2019 +0300
s3:smbspool: print a hint about smbspool_krb5_wrapper
When I first met with the situation that Kerberos kredentials cache of root
user was looked for instead of the one of the printing task creator,
it took a lot of time to understand that smbspool_krb5_wrapper will resolve
this.
Signed-off-by: Mikhail Novosyolov
Reviewed-by: Andreas Schneider
Reviewed-by: Guenther Deschner
commit 58a90358e2e8ff70c65eb49a21d00c5ce775ba54
Author: Mikhail Novosyolov
Date: Sun Nov 3 01:28:13 2019 +0300
s3:smbspool_krb5_wrapper: ignore unknown values of AUTH_INFO_REQUIRED
To make smbspool_krb5_wrapper usable as a default destination for symlink
/usr/lib/cups/backend/smb in Linux ditros, it has to be well-prepared
for any possible values of AUTH_INFO_REQUIRED set by cupsd and correctly
pass printing tasks to smbspool if it sees that Kerberos authentication
is not needed.
Discussed here:
https://lists.samba.org/archive/samba-technical/2019-October/134470.html
Signed-off-by: Mikhail Novosyolov
Reviewed-by: Andreas Schneider
Reviewed-by: Guenther Deschner
commit 6201b30421f616ec3f118321fd2998435792a4cc
Author: Andreas Schneider
Date: Mon Oct 28 09:38:08 2019 +0100
s3:smbspool_krb5_wrapper: Map AUTH_INFO_REQUIRED=none to anonymous
Signed-off-by: Andreas Schneider
Reviewed-by: Guenther Deschner
commit 1b42ccfc23eaa8f5b007928bc8bb65b944359f36
Author: Andreas Schneider
Date: Mon Oct 28 09:35:34 2019 +0100
s3:smbspool: Map AUTH_INFO_REQUIRED=none to anonymous connection
Signed-off-by: Andreas Schneider
Reviewed-by: Guenther Deschner
---
Summary of changes:
selftest/target/Samba4.pm | 3 ++
source3/client/smbspool.c | 13 ++---
source3/client/smbspool_krb5_wrapper.c | 53 +++---
source3/script/tests/test_smbspool.sh | 37
4 files changed, 85 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 1310e2ff09f..23dafba1574 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1845,6 +1845,9 @@ sub provision_ad_dc($$)
copy = print1
[print3]
copy = print1
+[print4]
+ copy = print1
+ guest ok = yes
[lp]
copy = print1
";
diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index 36f7f67ca94..5e2d230ab8b 100644
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -287,7 +287,7 @@ main(int argc, /* I - Number of
command-line arguments */
auth_info_required = getenv("AUTH_INFO_REQUIRED");
if (auth_info_required == NULL) {
- auth_info_required = "none";
+ auth_info_required = "samba";
}
/*
@@ -699,8 +699,8 @@ smb_connect(struct cli_state **output_cli,
if (strcmp(auth_info_required, "negotiate") == 0) {
if (!kerberos_ccache_is_valid()) {
fprintf(stderr,
- "ERROR: No valid Kerberos credential cache "
- "found!\n");
+ "ERROR: No valid Kerberos credential cache
found! "
+ "Using smbspool_krb5_wrapper may help.\n");
return NT_STATUS_LOGON_FAILURE;
}
user = jobusername;
@@ -718,7 +718,9 @@ smb_connect(struct cli_state **output_cli,
fprintf(stderr,
"DEBUG: Try to connect using username/password ...\n");
- } else {
+ } else if (strcmp(auth_info_required, "none") == 0) {
+ goto anonymous;
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8987d7eef4f s3:selfest: Do not print the env twice
via b05be655a92 s3:tests: Remove the -I SERVER_IP so that Kerberos auth
works
from 241f3709de5 docs-xml/Samba-Developers-Guide/vfs.xml: Fix incorrect
VFS func names.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8987d7eef4f2e1cb1ed29c3607bb6218f6cf668d
Author: Andreas Schneider
Date: Fri Nov 8 14:32:44 2019 +0100
s3:selfest: Do not print the env twice
Signed-off-by: Andreas Schneider
Reviewed-by: Gary Lockyer
Autobuild-User(master): Andreas Schneider
Autobuild-Date(master): Mon Dec 9 11:57:52 UTC 2019 on sn-devel-184
commit b05be655a9218add833d41a1765166de92431897
Author: Andreas Schneider
Date: Wed Nov 6 14:54:45 2019 +
s3:tests: Remove the -I SERVER_IP so that Kerberos auth works
Signed-off-by: Andreas Schneider
Reviewed-by: Gary Lockyer
---
Summary of changes:
selftest/knownfail | 6 +-
.../script/tests/test_smbclient_machine_auth.sh| 6 +-
source3/selftest/tests.py | 78 +++---
3 files changed, 45 insertions(+), 45 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/knownfail b/selftest/knownfail
index 82259dcfe90..6ee7af8ea03 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -23,7 +23,7 @@
# see bug 8412
^samba3.smb2.rename.*.simple_nodelete
^samba3.smb2.rename.*.no_share_delete_no_delete_access
-^samba3.blackbox.smbclient_machine_auth.plain \(nt4_dc:local\)# the NT4 DC
does not currently set up a self-join
+^samba3.blackbox.smbclient_machine_auth.plain.*nt4_dc:local # the NT4 DC does
not currently set up a self-join
^samba3.raw.samba3hide.samba3hide\(ad_dc\) # This test fails against the ad_dc
environment.
^samba3.raw.samba3closeerr.samba3closeerr\(nt4_dc\) # This test fails against
an smbd environment with NT ACLs enabled
^samba3.raw.acls nfs4acl_xattr-simple-40.INHERITFLAGS\(nt4_dc\) # This (and
the follow nfs4acl_xattr tests fail because our NFSv4 backend isn't a complete
mapping yet.
@@ -320,8 +320,8 @@
# fl2000dc doesn't support AES
^samba4.krb5.kdc.*as-req-aes.*fl2000dc
# nt4_member and ad_member don't support ntlmv1 (not even over SMB1)
-^samba3.blackbox.smbclient_auth.plain.*_member.*option=clientntlmv2auth=no.member.creds.*as.user
-^samba3.blackbox.smbclient_auth.plain.*_member.*option=clientntlmv2auth=no.*mNT1.member.creds.*as.user
+^samba3.blackbox.smbclient_auth.plain.*option=clientntlmv2auth=no.member.creds.*as.user.*_member
+^samba3.blackbox.smbclient_auth.plain.*option=clientntlmv2auth=no.*mNT1.member.creds.*as.user.*_member
#nt-vfs server blocks read with execute access
^samba4.smb2.read.access
#ntvfs server blocks copychunk with execute access on read handle
diff --git a/source3/script/tests/test_smbclient_machine_auth.sh
b/source3/script/tests/test_smbclient_machine_auth.sh
index a890d483149..8a2cc551728 100755
--- a/source3/script/tests/test_smbclient_machine_auth.sh
+++ b/source3/script/tests/test_smbclient_machine_auth.sh
@@ -18,8 +18,8 @@ ADDARGS="$*"
incdir=`dirname $0`/../../../testprogs/blackbox
. $incdir/subunit.sh
-testit "smbclient //$SERVER/tmp" $SMBCLIENT //$SERVER/tmp --machine-pass -I
$SERVER_IP -p 139 -c quit $ADDARGS
+testit "smbclient //$SERVER/tmp" $SMBCLIENT //$SERVER/tmp --machine-pass -p
139 -c quit $ADDARGS
# Testing these here helps because we know the machine account isn't already
this user/group
-testit "smbclient //$SERVER/forceuser" $SMBCLIENT //$SERVER/tmp --machine-pass
-I $SERVER_IP -p 139 -c quit $ADDARGS
-testit "smbclient //$SERVER/forcegroup" $SMBCLIENT //$SERVER/tmp
--machine-pass -I $SERVER_IP -p 139 -c quit $ADDARGS
+testit "smbclient //$SERVER/forceuser" $SMBCLIENT //$SERVER/tmp --machine-pass
-p 139 -c quit $ADDARGS
+testit "smbclient //$SERVER/forcegroup" $SMBCLIENT //$SERVER/tmp
--machine-pass -p 139 -c quit $ADDARGS
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 0e300f89148..f1434c860d3 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -245,17 +245,17 @@ plantestsuite("samba3.blackbox.smbclient_basic.SMB3_11",
"nt4_dc_schannel", [os.
plantestsuite("samba3.blackbox.smbclient_basic", "ad_member",
[os.path.join(samba3srcdir, "script/tests/test_smbclient_basic.sh"), '$SERVER',
'$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', smbclient3, configuration])
for options in ["", "--option=clientntlmv2auth=no",
"--option=clientusespnego=no", "--option=clientusespnego=no
--option=clientntlmv2auth=no", "--option=clientntlmv2auth=no
--option=clientlanmanauth=yes --max-protocol=LANMAN2",
"--option=clientntlmv2auth=no --option=clientlanmanauth=yes
--option=clientmaxprotocol=NT1"]:
env = "nt4_dc"
-
