[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  0eec334... s4:dcesrv_netr_DsrEnumerateDomainTrusts - fix an integer type
       via  aaf1c75... s4:torture/rpc/netlogon.c - add another "LogonGetDomainInfo" testcase
      from  3e0b2c8... s3: Fix some debug messages

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


- Log -----------------------------------------------------------------
commit 0eec33417eb56d1352fd66565f55162c62d86fcd
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Mon May 31 12:01:34 2010 +0200

    s4:dcesrv_netr_DsrEnumerateDomainTrusts - fix an integer type

commit aaf1c751f4cf447d80ef9dae341ef3247c1607e2
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Tue Apr 27 15:58:45 2010 +0200

    s4:torture/rpc/netlogon.c - add another "LogonGetDomainInfo" testcase
    
    Mark it as dangerous since it does break some target systems.

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

Summary of changes:
 source4/rpc_server/netlogon/dcerpc_netlogon.c |    2 +-
 source4/torture/rpc/netlogon.c                |   17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index c57f414..cfcb4f6 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -1980,7 +1980,7 @@ static WERROR dcesrv_netr_DsrEnumerateDomainTrusts(struct dcesrv_call_state *dce
 
 	/* NOTE: we currently are always the root of the forest */
 	if (r->in.trust_flags & NETR_TRUST_FLAG_IN_FOREST) {
-		int n = trusts->count;
+		uint32_t n = trusts->count;
 
 		ret = gendb_search_dn(sam_ctx, mem_ctx, NULL,
 				      &dom_res, dom_attrs);
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 96ae4c0..b1d6d1b 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -3150,6 +3150,23 @@ static bool test_GetDomainInfo(struct torture_context *tctx,
 		&& (info.domain_info->trusted_domains != NULL),
 		"Trusted domains have been requested!");
 
+
+	if (!torture_setting_bool(tctx, "dangerous", false)) {
+		torture_comment(tctx, "Not testing netr_LogonGetDomainInfo 6th call (no workstation info) - enable dangerous tests in order to do so\n");
+	} else {
+		/* Try a call without the workstation information structure */
+
+		torture_comment(tctx, "Testing netr_LogonGetDomainInfo 6th call (no workstation info)\n");
+		netlogon_creds_client_authenticator(creds, &a);
+
+		query.workstation_info = NULL;
+
+		torture_assert_ntstatus_ok(tctx, dcerpc_netr_LogonGetDomainInfo_r(b, tctx, &r),
+			"LogonGetDomainInfo failed");
+		torture_assert_ntstatus_ok(tctx, r.out.result, "LogonGetDomainInfo failed");
+		torture_assert(tctx, netlogon_creds_client_check(creds, &a.cred), "Credential chaining failed");
+	}
+
 	return true;
 }
 


-- 
Samba Shared Repository