[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Wed Dec 12 11:52:03 UTC 2018
The branch, master has been updated
via a80fee5054d s4:torture/smb2/session: Fix expire tests
via 55b2f247f9b s4:torture: Do not check if the alloc_size is 0 on empty files
via 0a001515bfc s3:modules: Remove superfloues sha256.h include in vfs_acl_xattr
via 9abe35ce565 s3:modules: Remove superfloues sha256.h include in vfs_acl_tdb
from bc179e6b5e7 tests: Add SMB Py binding .deltree test case
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a80fee5054db917050e0bda0482f8d17791d30dd
Author: Justin Stephenson <jstephen at redhat.com>
Date: Tue Dec 11 10:43:13 2018 -0500
s4:torture/smb2/session: Fix expire tests
When run with MIT kerberos, the smb2 session expire tests fail when run
against the ad_member test environment. The krb5 library initializes
values from the private krb5.conf profile
st/ad_member/lockdir/smb_krb5/krb5.conf.ADDOMAIN, this file does not
contain a defined clockskew setting. The expire tests require a low
clockskew value that is set in st/ad_member/lib/krb5.conf.
This patch disables the creation of the private krb5.conf for the
ad_member_idmap_rid testenv, and runs the smb2.session tests
against ad_member_idmap_rid instead of ad_member.
Signed-off-by: Justin Stephenson <jstephen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Wed Dec 12 12:51:24 CET 2018 on sn-devel-144
commit 55b2f247f9ba56516efba52481418966a777343e
Author: Andreas Schneider <asn at samba.org>
Date: Tue Dec 11 10:34:21 2018 +0100
s4:torture: Do not check if the alloc_size is 0 on empty files
The allocation size might not be zero. This depends on the file system
behavior and also on the size of the extended attributes stored on the
file. E.g. If a large user.DOSATTRIB xattr is stored on XFS/ext4 then 8
blocks are used and we will round up to several megabytes.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 0a001515bfc974d2ea109e8a13f9acf8fe86543a
Author: Andreas Schneider <asn at samba.org>
Date: Thu Oct 11 18:46:09 2018 +0200
s3:modules: Remove superfloues sha256.h include in vfs_acl_xattr
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 9abe35ce565fe2811b4367b6526dcf95a9209c68
Author: Andreas Schneider <asn at samba.org>
Date: Thu Oct 11 18:44:56 2018 +0200
s3:modules: Remove superfloues sha256.h include in vfs_acl_tdb
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
-----------------------------------------------------------------------
Summary of changes:
selftest/target/Samba3.pm | 3 +++
source3/modules/vfs_acl_tdb.c | 1 -
source3/modules/vfs_acl_xattr.c | 1 -
source3/selftest/tests.py | 4 +++-
source4/torture/smb2/durable_open.c | 1 -
source4/torture/smb2/durable_v2_open.c | 1 -
source4/torture/smb2/lease.c | 1 -
source4/torture/smb2/replay.c | 1 -
source4/torture/smb2/session.c | 2 --
9 files changed, 6 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 2234c11c795..63c24377e96 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -604,6 +604,9 @@ sub setup_ad_member_idmap_rid
idmap config * : range = 1000000-1999999
idmap config $dcvars->{DOMAIN} : backend = rid
idmap config $dcvars->{DOMAIN} : range = 2000000-2999999
+ # Prevent overridding the provisioned lib/krb5.conf which sets certain
+ # values required for tests to succeed
+ create krb5 conf = no
";
my $ret = $self->provision($prefix, $dcvars->{DOMAIN},
diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index 7506e4e34fa..e3945c404ae 100644
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -22,7 +22,6 @@
#include "smbd/smbd.h"
#include "system/filesys.h"
#include "librpc/gen_ndr/xattr.h"
-#include "../lib/crypto/sha256.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "auth.h"
diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index 94626cb8e03..b8190fd4b1c 100644
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -21,7 +21,6 @@
#include "includes.h"
#include "smbd/smbd.h"
#include "librpc/gen_ndr/xattr.h"
-#include "../lib/crypto/sha256.h"
#include "auth.h"
#include "vfs_acl_common.h"
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 065a41899e8..e7b4ebdbd8d 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -515,7 +515,9 @@ for t in tests:
plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmpenc -U$USERNAME%$PASSWORD', 'enc')
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -k no -U$USERNAME%$PASSWORD', 'ntlm')
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -k yes -U$USERNAME%$PASSWORD', 'krb5')
- plansmbtorture4testsuite(t, "ad_member", '//$SERVER/tmp -k yes -U$DC_USERNAME@$REALM%$DC_PASSWORD', 'krb5')
+ # Certain tests fail when run against ad_member with MIT kerberos because the private krb5.conf overrides the provisioned lib/krb5.conf,
+ # ad_member_idmap_rid sets "create krb5.conf = no"
+ plansmbtorture4testsuite(t, "ad_member_idmap_rid", '//$SERVER/tmp -k yes -U$DC_USERNAME@$REALM%$DC_PASSWORD', 'krb5')
elif t == "rpc.lsa":
plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD', 'over ncacn_np ')
plansmbtorture4testsuite(t, "nt4_dc", 'ncacn_ip_tcp:$SERVER_IP -U$USERNAME%$PASSWORD', 'over ncacn_ip_tcp ')
diff --git a/source4/torture/smb2/durable_open.c b/source4/torture/smb2/durable_open.c
index 17b3b217b56..229c39dce67 100644
--- a/source4/torture/smb2/durable_open.c
+++ b/source4/torture/smb2/durable_open.c
@@ -60,7 +60,6 @@
#define CHECK_CREATED(__io, __created, __attribute) \
do { \
CHECK_VAL((__io)->out.create_action, NTCREATEX_ACTION_ ## __created); \
- CHECK_VAL((__io)->out.alloc_size, 0); \
CHECK_VAL((__io)->out.size, 0); \
CHECK_VAL((__io)->out.file_attr, (__attribute)); \
CHECK_VAL((__io)->out.reserved2, 0); \
diff --git a/source4/torture/smb2/durable_v2_open.c b/source4/torture/smb2/durable_v2_open.c
index 25e6d27465a..7609987e31f 100644
--- a/source4/torture/smb2/durable_v2_open.c
+++ b/source4/torture/smb2/durable_v2_open.c
@@ -45,7 +45,6 @@
#define CHECK_CREATED(__io, __created, __attribute) \
do { \
CHECK_VAL((__io)->out.create_action, NTCREATEX_ACTION_ ## __created); \
- CHECK_VAL((__io)->out.alloc_size, 0); \
CHECK_VAL((__io)->out.size, 0); \
CHECK_VAL((__io)->out.file_attr, (__attribute)); \
CHECK_VAL((__io)->out.reserved2, 0); \
diff --git a/source4/torture/smb2/lease.c b/source4/torture/smb2/lease.c
index bf45988222a..430fcd0a6e1 100644
--- a/source4/torture/smb2/lease.c
+++ b/source4/torture/smb2/lease.c
@@ -49,7 +49,6 @@
#define CHECK_CREATED(__io, __created, __attribute) \
do { \
CHECK_VAL((__io)->out.create_action, NTCREATEX_ACTION_ ## __created); \
- CHECK_VAL((__io)->out.alloc_size, 0); \
CHECK_VAL((__io)->out.size, 0); \
CHECK_VAL((__io)->out.file_attr, (__attribute)); \
CHECK_VAL((__io)->out.reserved2, 0); \
diff --git a/source4/torture/smb2/replay.c b/source4/torture/smb2/replay.c
index 2ef40445aee..443d372a1d7 100644
--- a/source4/torture/smb2/replay.c
+++ b/source4/torture/smb2/replay.c
@@ -52,7 +52,6 @@
#define CHECK_CREATED(__io, __created, __attribute) \
do { \
CHECK_VAL((__io)->out.create_action, NTCREATEX_ACTION_ ## __created); \
- CHECK_VAL((__io)->out.alloc_size, 0); \
CHECK_VAL((__io)->out.size, 0); \
CHECK_VAL((__io)->out.file_attr, (__attribute)); \
CHECK_VAL((__io)->out.reserved2, 0); \
diff --git a/source4/torture/smb2/session.c b/source4/torture/smb2/session.c
index 3917e0c09c4..6d5f7b8594e 100644
--- a/source4/torture/smb2/session.c
+++ b/source4/torture/smb2/session.c
@@ -38,8 +38,6 @@
torture_assert_int_equal(tctx, (__io)->out.create_action, \
NTCREATEX_ACTION_ ## __created, \
"out.create_action incorrect"); \
- torture_assert_int_equal(tctx, (__io)->out.alloc_size, 0, \
- "out.alloc_size incorrect"); \
torture_assert_int_equal(tctx, (__io)->out.size, 0, \
"out.size incorrect"); \
torture_assert_int_equal(tctx, (__io)->out.file_attr, \
--
Samba Shared Repository
More information about the samba-cvs
mailing list