[SCM] Samba Shared Repository - branch master updated

Garming Sam garming at samba.org
Mon Mar 14 02:56:02 UTC 2016

The branch, master has been updated
       via  e8e0ffc tests: Allow alternative error code for backupkey test
      from  6ecfc4c dsdb/repl: Ensure we use the LOCAL attid value, not the remote one


- Log -----------------------------------------------------------------
commit e8e0ffcc495b19b2efa913c0eac4875edfc56c3b
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Mon Mar 14 12:02:06 2016 +1300

    tests: Allow alternative error code for backupkey test
    It appears that incorrect decryption triggers a different error code,
    causing a test which fails every now and again, as sometimes the invalid
    data will parse as a SID, and so pass one of the checks.
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Autobuild-User(master): Garming Sam <garming at samba.org>
    Autobuild-Date(master): Mon Mar 14 03:55:16 CET 2016 on sn-devel-144


Summary of changes:
 source4/torture/rpc/backupkey_heimdal.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/backupkey_heimdal.c b/source4/torture/rpc/backupkey_heimdal.c
index d661956..32b0235 100644
--- a/source4/torture/rpc/backupkey_heimdal.c
+++ b/source4/torture/rpc/backupkey_heimdal.c
@@ -1977,10 +1977,11 @@ static bool test_ServerWrap_decrypt_wrong_stuff(struct torture_context *tctx,
 					  "decrypt should fail with WERR_INVALID_ACCESS");
 	} else {
-		torture_assert_werr_equal(tctx,
-					  r.out.result,
-					  "decrypt should fail with WERR_INVALID_PARAM");
+		if (!W_ERROR_EQUAL(r.out.result, WERR_INVALID_PARAM)) {
+			torture_assert_werr_equal(tctx, r.out.result,
+						  "decrypt should fail with WERR_INVALID_PARAM or WERR_INVALID_DATA");
+		}
 	return true;

Samba Shared Repository

More information about the samba-cvs mailing list