svn commit: samba r5090 - in branches/SAMBA_4_0/source: librpc/idl rpc_server/netlogon torture/rpc

[abartlet at samba.org]

Author: abartlet
Date: 2005-01-29 04:02:13 +0000 (Sat, 29 Jan 2005)
New Revision: 5090

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5090

Log:
Fix up the IDL for LogonGetDomainInfo in NETLOGON.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
   branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c
   branches/SAMBA_4_0/source/torture/rpc/netlogon.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/netlogon.idl	2005-01-29 04:01:23 UTC (rev 5089)
+++ branches/SAMBA_4_0/source/librpc/idl/netlogon.idl	2005-01-29 04:02:13 UTC (rev 5090)
@@ -972,9 +972,9 @@
 		unistr *unknown4;
 		netr_BinaryString blob2;
 		netr_String product;
-		uint32 unknown5;
-		unistr *unknown6;
-		uint32 unknown7[6];
+		netr_String unknown5;
+		netr_String unknown6;
+		uint32 unknown7[4];
 	} netr_DomainQuery1;
 
 	typedef union {
@@ -1007,9 +1007,8 @@
 	NTSTATUS netr_LogonGetDomainInfo(
 		[in]         unistr server_name,
 		[in]         unistr *computer_name,
-		[in,out,ref] netr_Authenticator *credential,
-		[in]         uint32 unknown1,
-		[in]         uint32 i1[2],
+		[in,ref]     netr_Authenticator *credential,
+		[in,out,ref] netr_Authenticator *return_authenticator,
 		[in]	     uint32 level,
 		[in,switch_is(level)] netr_DomainQuery query,
 		[out,switch_is(level)] netr_DomainInfo info

Modified: branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c	2005-01-29 04:01:23 UTC (rev 5089)
+++ branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c	2005-01-29 04:02:13 UTC (rev 5090)
@@ -938,7 +938,7 @@
 	NTSTATUS status;
 
 	status = netr_creds_server_step_check(pipe_state, 
-					      r->in.credential, r->out.credential);
+					      r->in.credential, r->out.return_authenticator);
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}

Modified: branches/SAMBA_4_0/source/torture/rpc/netlogon.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/netlogon.c	2005-01-29 04:01:23 UTC (rev 5089)
+++ branches/SAMBA_4_0/source/torture/rpc/netlogon.c	2005-01-29 04:02:13 UTC (rev 5090)
@@ -1094,14 +1094,11 @@
 
 	r.in.server_name = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
 	r.in.computer_name = TEST_MACHINE_NAME;
-	r.in.unknown1 = 512;
 	r.in.level = 1;
 	r.in.credential = &a;
-	r.out.credential = &a;
+	r.in.return_authenticator = &a;
+	r.out.return_authenticator = &a;
 
-	r.in.i1[0] = 0;
-	r.in.i1[1] = 0;
-
 	r.in.query.query1 = &q1;
 	ZERO_STRUCT(q1);
 	
@@ -1164,14 +1161,11 @@
 	ZERO_STRUCT(r);
 	r.in.server_name = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
 	r.in.computer_name = TEST_MACHINE_NAME;
-	r.in.unknown1 = 512;
 	r.in.level = 1;
 	r.in.credential = &a;
-	r.out.credential = &a;
+	r.in.return_authenticator = &a;
+	r.out.return_authenticator = &a;
 
-	r.in.i1[0] = 0;
-	r.in.i1[1] = 0;
-
 	r.in.query.query1 = &q1;
 	ZERO_STRUCT(q1);