added netr_AccountDeltas(), which w2k3 gives

"NT_STATUS_NOT_IMPLEMENTED" for
(This used to be commit aaf776a1c134d7b6112932f880e09ba497e8ebcf)

2 files changed, 54 insertions, 6 deletions

diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index fc89d0820d..06a2581fd4 100644
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -606,24 +606,31 @@ interface netlogon
 	/*****************/
 	/* Function 0x09 */
 
-	typedef struct {
+	/* w2k3 returns NT_STATUS_NOT_IMPLEMENTED for this call */
+
+	typedef [flag(NDR_PAHEX)] struct {
 		uint8 computer_name[16];
 		uint32 timecreated;
 		uint32 serial_number;
 	} UAS_INFO_0;
 
+	typedef struct {
+		[flag(NDR_REMAINING)] DATA_BLOB blob;
+	} netr_AccountBuffer;
+
 	NTSTATUS netr_AccountDeltas(
 		[in]     unistr *logonserver,
 		[in]     unistr computername,
 		[in]     netr_Authenticator credential,
 		[in,out] netr_Authenticator return_authenticator,
-		[out][size_is(count_returned)] uint8 *buffer,
-		[out]    uint32 count_returned,
-		[out]    uint32 total_entries,
-		[in,out] UAS_INFO_0 recordid,
+		[in]     UAS_INFO_0 uas,
 		[in]     uint32 count,
 		[in]     uint32 level,
-		[in]     uint32 buffersize
+		[in]     uint32 buffersize,
+		[out,subcontext(4)] netr_AccountBuffer buffer,
+		[out]    uint32 count_returned,
+		[out]    uint32 total_entries,
+		[out]    UAS_INFO_0 recordid
 		);
 
 #if 0
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 81d9b2cdf9..07776026d0 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -358,6 +358,42 @@ static BOOL test_DatabaseDeltas(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 }
 
 
+/*
+  try a netlogon AccountDeltas
+*/
+static BOOL test_AccountDeltas(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+{
+	NTSTATUS status;
+	struct netr_AccountDeltas r;
+	struct netr_CredentialState creds;
+	BOOL ret = True;
+
+	if (!test_SetupCredentials(p, mem_ctx, &creds)) {
+		return False;
+	}
+
+	r.in.logonserver = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+	r.in.computername = lp_netbios_name();
+	ZERO_STRUCT(r.in.return_authenticator);
+	creds_client_authenticator(&creds, &r.in.credential);
+	ZERO_STRUCT(r.in.uas);
+	r.in.count=10;
+	r.in.level=0;
+	r.in.buffersize=100;
+
+	printf("Testing AccountDeltas\n");
+
+	/* w2k3 returns "NOT IMPLEMENTED" for this call */
+	status = dcerpc_netr_AccountDeltas(p, mem_ctx, &r);
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED)) {
+		printf("AccountDeltas - %s\n", nt_errstr(status));
+		ret = False;
+	}
+
+	return ret;
+}
+
+
 BOOL torture_rpc_netlogon(int dummy)
 {
         NTSTATUS status;
@@ -377,6 +413,11 @@ BOOL torture_rpc_netlogon(int dummy)
 	
 	p->flags |= DCERPC_DEBUG_PRINT_BOTH;
 
+	if (!test_AccountDeltas(p, mem_ctx)) {
+		ret = False;
+	}
+	return ret;
+
 	if (!test_LogonUasLogon(p, mem_ctx)) {
 		ret = False;
 	}