The branch, master has been updated
via 065dcc8 selftest: Merge alternate error codes into backupkey from
backupkey_heimdal
via 664bde1 torture/backupkey: Allow WERR_INVALID_ACCESS,
WERR_INVALID_PARAM or WERR_INVALID_DATA
from 24e28c0 ctdb-mutex: Fix CID 1359217 Resource leak (RESOURCE_LEAK)
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 065dcc8a45fa77b00355b61a8f25d046c9d349cf
Author: Andrew Bartlett <[email protected]>
Date: Tue Aug 2 13:20:46 2016 +1200
selftest: Merge alternate error codes into backupkey from backupkey_heimdal
This is from cea4a4b9b22c78f9736e2290d302a88644db4031 and
613d085a63ee554084cb99d2150921dd108f6b77
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12107
Signed-off-by: Andrew Bartlett <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Wed Aug 3 21:43:21 CEST 2016 on sn-devel-144
commit 664bde19bf1db1b3740621cdf3f46f9bfd0e8452
Author: Andrew Bartlett <[email protected]>
Date: Tue Aug 2 13:16:35 2016 +1200
torture/backupkey: Allow WERR_INVALID_ACCESS, WERR_INVALID_PARAM or
WERR_INVALID_DATA
The use of the wrong key can still create structures that parse as a SID,
therefore we can sometimes get an unusual error, which becomes a flapping
test
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12107
Signed-off-by: Andrew Bartlett <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source4/torture/rpc/backupkey.c | 10 ++++++----
source4/torture/rpc/backupkey_heimdal.c | 5 +++--
2 files changed, 9 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/backupkey.c b/source4/torture/rpc/backupkey.c
index ca981c2..276fa7f 100644
--- a/source4/torture/rpc/backupkey.c
+++ b/source4/torture/rpc/backupkey.c
@@ -2217,10 +2217,12 @@ static bool test_ServerWrap_decrypt_wrong_stuff(struct
torture_context *tctx,
WERR_INVALID_ACCESS,
"decrypt should fail with
WERR_INVALID_ACCESS");
} else {
- torture_assert_werr_equal(tctx,
- r.out.result,
- WERR_INVALID_PARAM,
- "decrypt should fail with
WERR_INVALID_PARAM");
+ if (!W_ERROR_EQUAL(r.out.result, WERR_INVALID_ACCESS)
+ && !W_ERROR_EQUAL(r.out.result, WERR_INVALID_PARAM)) {
+ torture_assert_werr_equal(tctx, r.out.result,
+ WERR_INVALID_DATA,
+ "decrypt should fail with
WERR_INVALID_ACCESS, WERR_INVALID_PARAM or WERR_INVALID_DATA");
+ }
}
/* Decrypt */
diff --git a/source4/torture/rpc/backupkey_heimdal.c
b/source4/torture/rpc/backupkey_heimdal.c
index c0db48d..370700a 100644
--- a/source4/torture/rpc/backupkey_heimdal.c
+++ b/source4/torture/rpc/backupkey_heimdal.c
@@ -1979,10 +1979,11 @@ static bool test_ServerWrap_decrypt_wrong_stuff(struct
torture_context *tctx,
WERR_INVALID_ACCESS,
"decrypt should fail with
WERR_INVALID_ACCESS");
} else {
- if (!W_ERROR_EQUAL(r.out.result, WERR_INVALID_PARAM)) {
+ if (!W_ERROR_EQUAL(r.out.result, WERR_INVALID_ACCESS)
+ && !W_ERROR_EQUAL(r.out.result, WERR_INVALID_PARAM)) {
torture_assert_werr_equal(tctx, r.out.result,
WERR_INVALID_DATA,
- "decrypt should fail with
WERR_INVALID_PARAM or WERR_INVALID_DATA");
+ "decrypt should fail with
WERR_INVALID_ACCESS, WERR_INVALID_PARAM or WERR_INVALID_DATA");
}
}
--
Samba Shared Repository
