[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-332-g4720f53

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  4720f53a92644dd6959e18923924fbe01889111c (commit)
       via  9cd3a76c25019f4d8d7b41d75e1f7efb4475e86a (commit)
       via  5c39f3135666854b57a7d2643f59feee7ceeabc8 (commit)
      from  ad9089c413bfac6dddda5e837d7143fe7a2c29fb (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 4720f53a92644dd6959e18923924fbe01889111c
Merge: 9cd3a76c25019f4d8d7b41d75e1f7efb4475e86a ad9089c413bfac6dddda5e837d7143fe7a2c29fb
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Jan 11 09:25:14 2008 +1100

    Merge commit 'origin/v4-0-test' into 4-0-local

commit 9cd3a76c25019f4d8d7b41d75e1f7efb4475e86a
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Jan 11 09:24:38 2008 +1100

    Return 'not implemented' on more RPCs.  (easy way to 'pass' the
    torture test, as I see little reason to implement these RPCs).
    
    Add information regarding the importance of the LogonGetDomainInfo calls
    
    Andrew Bartlett

commit 5c39f3135666854b57a7d2643f59feee7ceeabc8
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Jan 11 09:22:26 2008 +1100

    Native move servers will refuse these SamSync operations, so don't
    count them as errors.
    
    Andrew Bartlett

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

Summary of changes:
 source/rpc_server/netlogon/dcerpc_netlogon.c |    9 +++++++--
 source/torture/rpc/netlogon.c                |    9 +++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/netlogon/dcerpc_netlogon.c b/source/rpc_server/netlogon/dcerpc_netlogon.c
index 1ef50cd..3d9262b 100644
--- a/source/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source/rpc_server/netlogon/dcerpc_netlogon.c
@@ -669,7 +669,8 @@ static NTSTATUS dcesrv_netr_DatabaseDeltas(struct dcesrv_call_state *dce_call, T
 static NTSTATUS dcesrv_netr_DatabaseSync(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct netr_DatabaseSync *r)
 {
-	DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+	/* win2k3 native mode returns  "NOT IMPLEMENTED" for this call */
+	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 
@@ -741,7 +742,8 @@ static WERROR dcesrv_netr_LogonControl2(struct dcesrv_call_state *dce_call, TALL
 static NTSTATUS dcesrv_netr_DatabaseSync2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct netr_DatabaseSync2 *r)
 {
-	DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+	/* win2k3 native mode returns  "NOT IMPLEMENTED" for this call */
+	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 
@@ -867,6 +869,9 @@ static NTSTATUS fill_domain_trust_info(TALLOC_CTX *mem_ctx,
 /* 
   netr_LogonGetDomainInfo
   this is called as part of the ADS domain logon procedure.
+
+  It has an important role in convaying details about the client, such
+  as Operating System, Version, Service Pack etc.
 */
 static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 					struct netr_LogonGetDomainInfo *r)
diff --git a/source/torture/rpc/netlogon.c b/source/torture/rpc/netlogon.c
index 74bc3a2..a13172b 100644
--- a/source/torture/rpc/netlogon.c
+++ b/source/torture/rpc/netlogon.c
@@ -647,6 +647,10 @@ static bool test_DatabaseSync(struct torture_context *tctx,
 			if (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES))
 			    break;
 
+			/* Native mode servers don't do this */
+			if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
+				return true;
+			}
 			torture_assert_ntstatus_ok(tctx, status, "DatabaseSync");
 
 			if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
@@ -968,6 +972,11 @@ static bool test_DatabaseSync2(struct torture_context *tctx,
 			if (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES))
 			    break;
 
+			/* Native mode servers don't do this */
+			if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
+				return true;
+			}
+
 			torture_assert_ntstatus_ok(tctx, status, "DatabaseSync2");
 
 			if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {


-- 
Samba Shared Repository