[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  279bf89... s4:torture/rpc/countcalls: check for NT_STATUS_IS_RPC() instead of NT_STATUS_NET_WRITE_FAULT
       via  3f8e9b9... s4:libnet_passwd: check for NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE for SetPassword
       via  2570f8d... s4:libnet_passwd: check for NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE in the ChangePassword calls
       via  b2261c8... s4:libnet_rpc: check for NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE instead of NT_STATUS_NET_WRITE_FAULT
      from  cec0e86... s4:Added a test to make sure we ignore ACEs with ID flag set.

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


- Log -----------------------------------------------------------------
commit 279bf89fb37cc4d2a4b514301bc5bdb61ca48740
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Apr 15 17:22:41 2010 +0200

    s4:torture/rpc/countcalls: check for NT_STATUS_IS_RPC() instead of NT_STATUS_NET_WRITE_FAULT
    
    metze

commit 3f8e9b919dc74fb8aae903e03344fe62cadf5fd5
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Apr 15 17:21:13 2010 +0200

    s4:libnet_passwd: check for NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE for SetPassword
    
    metze

commit 2570f8dcdadcc889dcc33824b2dcfe4e6050781b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Apr 15 17:20:21 2010 +0200

    s4:libnet_passwd: check for NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE in the ChangePassword calls
    
    metze

commit b2261c82722d5c2f5479ec3177a0fc0e17163aca
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Apr 15 17:19:19 2010 +0200

    s4:libnet_rpc: check for NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE instead of NT_STATUS_NET_WRITE_FAULT
    
    metze

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

Summary of changes:
 source4/libnet/libnet_passwd.c   |    8 ++++----
 source4/libnet/libnet_rpc.c      |    2 +-
 source4/torture/rpc/countcalls.c |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
index 93d126f..e1094f2 100644
--- a/source4/libnet/libnet_passwd.c
+++ b/source4/libnet/libnet_passwd.c
@@ -102,7 +102,7 @@ static NTSTATUS libnet_ChangePassword_samr(struct libnet_context *ctx, TALLOC_CT
 
 	/* 2. try samr_ChangePasswordUser3 */
 	status = dcerpc_samr_ChangePasswordUser3_r(c.out.dcerpc_pipe->binding_handle, mem_ctx, &pw3);
-	if (!NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) {
 		if (NT_STATUS_IS_OK(status) && !NT_STATUS_IS_OK(pw3.out.result)) {
 			status = pw3.out.result;
 		}
@@ -137,7 +137,7 @@ static NTSTATUS libnet_ChangePassword_samr(struct libnet_context *ctx, TALLOC_CT
 
 	/* 3. try samr_ChangePasswordUser2 */
 	status = dcerpc_samr_ChangePasswordUser2_r(c.out.dcerpc_pipe->binding_handle, mem_ctx, &pw2);
-	if (!NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) {
 		if (NT_STATUS_IS_OK(status) && !NT_STATUS_IS_OK(pw2.out.result)) {
 			status = pw2.out.result;
 		}
@@ -166,7 +166,7 @@ static NTSTATUS libnet_ChangePassword_samr(struct libnet_context *ctx, TALLOC_CT
 
 	/* 4. try samr_OemChangePasswordUser2 */
 	status = dcerpc_samr_OemChangePasswordUser2_r(c.out.dcerpc_pipe->binding_handle, mem_ctx, &oe2);
-	if (!NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) {
 		if (NT_STATUS_IS_OK(status) && !NT_STATUS_IS_OK(oe2.out.result)) {
 			status = oe2.out.result;
 		}
@@ -491,7 +491,7 @@ static NTSTATUS libnet_SetPassword_samr_handle(struct libnet_context *ctx, TALLO
 		status = libnet_SetPassword(ctx, mem_ctx, r);
 		if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS)
 		    || NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER_MIX)
-		    || NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+		    || NT_STATUS_EQUAL(status, NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE)) {
 			/* Try another password set mechanism */
 			continue;
 		}
diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c
index 83df262..138b926 100644
--- a/source4/libnet/libnet_rpc.c
+++ b/source4/libnet/libnet_rpc.c
@@ -659,7 +659,7 @@ static void continue_lsa_query_info2(struct tevent_req *subreq)
 	   to the next step. After all, it doesn't have to be AD domain
 	   controller we talking to - NT-style PDC also counts */
 
-	if (NT_STATUS_EQUAL(c->status, NT_STATUS_NET_WRITE_FAULT)) {
+	if (NT_STATUS_EQUAL(c->status, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) {
 		s->r.out.realm = NULL;
 		s->r.out.guid  = NULL;
 
diff --git a/source4/torture/rpc/countcalls.c b/source4/torture/rpc/countcalls.c
index 5857af6..7d3c9d7 100644
--- a/source4/torture/rpc/countcalls.c
+++ b/source4/torture/rpc/countcalls.c
@@ -38,7 +38,7 @@ bool count_calls(struct torture_context *tctx,
 	int i;
 	NTSTATUS status = torture_rpc_connection(tctx, &p, iface);
 	if (NT_STATUS_EQUAL(NT_STATUS_OBJECT_NAME_NOT_FOUND, status)
-	    || NT_STATUS_EQUAL(NT_STATUS_NET_WRITE_FAULT, status)
+	    || NT_STATUS_IS_RPC(status)
 	    || NT_STATUS_EQUAL(NT_STATUS_PORT_UNREACHABLE, status)
 	    || NT_STATUS_EQUAL(NT_STATUS_ACCESS_DENIED, status)) {
 		if (all) {


-- 
Samba Shared Repository