[SCM] Samba Shared Repository - branch master updated

Matthias Dieter Wallnöfer mdw at samba.org
Tue May 25 04:18:21 MDT 2010


The branch, master has been updated
       via  abf2764... s4:torture/rpc/samr.c: Fix the "ValidatePassword" test
      from  af2cbaa... s3:registry: add C for substantial changes to reg_objects

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit abf27643616a0ad2c0477869c2146d852ee57026
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Tue May 25 11:21:46 2010 +0200

    s4:torture/rpc/samr.c: Fix the "ValidatePassword" test
    
    It was failing randomly due to an uninitialised "status" variable.

-----------------------------------------------------------------------

Summary of changes:
 source4/torture/rpc/samr.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index c44c4ef..b87cac5 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -7916,12 +7916,15 @@ static bool test_samr_ValidatePassword(struct dcerpc_pipe *p,
 
 	for (i=0; passwords[i]; i++) {
 		req.req3.password.string = passwords[i];
-		torture_assert_ntstatus_ok(tctx, dcerpc_samr_ValidatePassword_r(b, tctx, &r),
-			"ValidatePassword failed");
+
+		status = dcerpc_samr_ValidatePassword_r(b, tctx, &r);
 		if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) {
 			torture_skip(tctx, "ValidatePassword not supported by server\n");
 		}
-		torture_assert_ntstatus_ok(tctx, r.out.result, "samr_ValidatePassword");
+		torture_assert_ntstatus_ok(tctx, status,
+					   "samr_ValidatePassword failed");
+		torture_assert_ntstatus_ok(tctx, r.out.result,
+					   "samr_ValidatePassword failed");
 		torture_comment(tctx, "Server %s password '%s' with code %i\n",
 				repp->ctr3.status==SAMR_VALIDATION_STATUS_SUCCESS?"allowed":"refused",
 				req.req3.password.string, repp->ctr3.status);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list