[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  6346ec0... s3:selftest: handle spaces in test names
       via  654f114... s3:selftest: make wbinfo_s3 work on the "member" server too.
       via  9f2f738... s3:test_wbinfo_s3: test --check-secret and --change-secret
       via  9112872... s3:rpc_transport_np: handle trans rdata like the output of a normal read
      from  1b78573... s4-smbtorture: verify that the client cpu architecture has no influence on the calculated buffer size in RPC-SPOOLSS.

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


- Log -----------------------------------------------------------------
commit 6346ec0c1cadd54f2fa10f7dc0a39a3791bed822
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Feb 24 10:09:32 2010 +0100

    s3:selftest: handle spaces in test names
    
    metze

commit 654f1147e1bcf146d3c706682c8d3ccef2d31ae4
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Feb 24 09:33:19 2010 +0100

    s3:selftest: make wbinfo_s3 work on the "member" server too.
    
    metze

commit 9f2f738a3c7ca5d16094d2ffa100b7135607b06f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 23 14:15:00 2010 +0100

    s3:test_wbinfo_s3: test --check-secret and --change-secret
    
    metze

commit 911287285cc4c8485b75edfad3c1ece901a69b0b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Feb 20 09:08:16 2010 +0100

    s3:rpc_transport_np: handle trans rdata like the output of a normal read
    
    Inspired by bug #7159.
    
    metze

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

Summary of changes:
 source3/rpc_client/rpc_transport_np.c  |   17 +++++++++++++++++
 source3/script/tests/test_wbinfo_s3.sh |    4 ++++
 source3/selftest/tests.sh              |   17 ++++++++++++++++-
 3 files changed, 37 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_client/rpc_transport_np.c b/source3/rpc_client/rpc_transport_np.c
index 623a8b3..de734fe 100644
--- a/source3/rpc_client/rpc_transport_np.c
+++ b/source3/rpc_client/rpc_transport_np.c
@@ -206,6 +206,7 @@ static NTSTATUS rpc_np_read_recv(struct tevent_req *req, ssize_t *preceived)
 
 struct rpc_np_trans_state {
 	uint16_t setup[2];
+	uint32_t max_rdata_len;
 	uint8_t *rdata;
 	uint32_t rdata_len;
 };
@@ -228,6 +229,8 @@ static struct tevent_req *rpc_np_trans_send(TALLOC_CTX *mem_ctx,
 		return NULL;
 	}
 
+	state->max_rdata_len = max_rdata_len;
+
 	SSVAL(state->setup+0, 0, TRANSACT_DCERPCCMD);
 	SSVAL(state->setup+1, 0, np_transport->fnum);
 
@@ -257,10 +260,24 @@ static void rpc_np_trans_done(struct tevent_req *subreq)
 	status = cli_trans_recv(subreq, state, NULL, 0, NULL, NULL, 0, NULL,
 				&state->rdata, 0, &state->rdata_len);
 	TALLOC_FREE(subreq);
+	if (NT_STATUS_EQUAL(status, NT_STATUS_BUFFER_TOO_SMALL)) {
+		status = NT_STATUS_OK;
+	}
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
 		return;
 	}
+
+	if (state->rdata_len > state->max_rdata_len) {
+		tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+		return;
+	}
+
+	if (state->rdata_len == 0) {
+		tevent_req_nterror(req, NT_STATUS_PIPE_BROKEN);
+		return;
+	}
+
 	tevent_req_done(req);
 }
 
diff --git a/source3/script/tests/test_wbinfo_s3.sh b/source3/script/tests/test_wbinfo_s3.sh
index 9758014..d501311 100755
--- a/source3/script/tests/test_wbinfo_s3.sh
+++ b/source3/script/tests/test_wbinfo_s3.sh
@@ -31,6 +31,10 @@ tests="$tests:--domain-info=$domain"
 tests="$tests:--online-status"
 tests="$tests:--online-status --domain=BUILTIN"
 tests="$tests:--online-status --domain=$domain"
+tests="$tests:--check-secret --domain=$domain"
+tests="$tests:--change-secret --domain=$domain"
+tests="$tests:--check-secret --domain=$domain"
+tests="$tests:--online-status --domain=$domain"
 #Didn't pass yet# tests="$tests:--domain-users"
 tests="$tests:--domain-groups"
 tests="$tests:--name-to-sid=$username"
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index 2fe54b2..4c96c3b 100755
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -41,7 +41,8 @@ plantest() {
 normalize_testname() {
 	name=$1
 	shift 1
-	echo $name | tr "A-Z-" "a-z."
+	n=`echo $name | tr "A-Z-" "a-z."`
+	echo "$n $@"
 }
 
 TEST_FUNCTIONS_SH="INCLUDED"
@@ -110,6 +111,20 @@ export PASSWORD
 
 (
 	shift $#
+	testitprefix="wbinfo_s3."
+	testitenv="dc:local"
+	. $SCRIPTDIR/test_wbinfo_s3.sh \$DOMAIN \$SERVER \$DOMAIN\\\\\$USERNAME \$PASSWORD
+)
+
+(
+	shift $#
+	testitprefix="wbinfo_s3."
+	testitenv="member:local"
+	. $SCRIPTDIR/test_wbinfo_s3.sh \$DOMAIN \$SERVER \$DOMAIN\\\\\$USERNAME \$PASSWORD
+)
+
+(
+	shift $#
 	testitprefix="ntlm_auth_s3."
 	testitenv="dc:local"
 	. $SCRIPTDIR/test_ntlm_auth_s3.sh


-- 
Samba Shared Repository