From edbfc0f6e70150e321822365bf0eead2821551bd Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 2 Nov 2004 02:57:18 +0000
Subject: r3453: - split out the auth and popt includes

- tidied up some of the system includes

- moved a few more structures back from misc.idl to netlogon.idl and samr.idl now that pidl
  knows about inter-IDL dependencies
(This used to be commit 7b7477ac42d96faac1b0ff361525d2c63cedfc64)
---
 source4/librpc/idl/misc.idl          | 14 --------------
 source4/librpc/idl/netlogon.idl      |  8 ++++++++
 source4/librpc/idl/samr.idl          |  6 ++++++
 source4/librpc/rpc/dcerpc_schannel.c |  1 +
 4 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'source4/librpc')

diff --git a/source4/librpc/idl/misc.idl b/source4/librpc/idl/misc.idl
index ce884b6c5c..dd31f0f54a 100644
--- a/source4/librpc/idl/misc.idl
+++ b/source4/librpc/idl/misc.idl
@@ -123,24 +123,10 @@ interface misc
 		GUID   uuid;
 	} policy_handle;
 
-	/* this is also used in samr and netlogon */
-	typedef [public, flag(NDR_PAHEX)] struct {
-		uint16 units_per_week;
-		[size_is(1260), length_is(units_per_week/8)] uint8 *bitmap;
-	} samr_LogonHours;
-
 	typedef [public, flag(NDR_PAHEX)] struct {
 		uint8 hash[16];
 	} samr_Password;
 
-	typedef [public,flag(NDR_PAHEX)] struct {
-		uint8 key[16];
-	} netr_UserSessionKey;
-
-	typedef [public,flag(NDR_PAHEX)] struct {
-		uint8 key[8];
-	} netr_LMSessionKey;
-
 	typedef [public, flag(NDR_PAHEX)] struct {
 		uint8 data[8];
 	} netr_Credential;
diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index b880698ffd..7f04d2b648 100644
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -129,6 +129,14 @@ interface netlogon
 		uint32 attributes;
 	} netr_GroupMembership;
 
+	typedef [public,flag(NDR_PAHEX)] struct {
+		uint8 key[16];
+	} netr_UserSessionKey;
+
+	typedef [public,flag(NDR_PAHEX)] struct {
+		uint8 key[8];
+	} netr_LMSessionKey;
+
 	typedef [public] struct {
 		NTTIME last_logon;
 		NTTIME last_logoff;
diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index 4d41e389e6..df33066a12 100644
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -567,6 +567,12 @@
 		uint16 code_page;
 	} samr_UserInfo2;
 
+	/* this is also used in samr and netlogon */
+	typedef [public, flag(NDR_PAHEX)] struct {
+		uint16 units_per_week;
+		[size_is(1260), length_is(units_per_week/8)] uint8 *bitmap;
+	} samr_LogonHours;
+
 	typedef struct {
 		samr_Name account_name;
 		samr_Name full_name;
diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c
index d6fc7ad511..3472e1cbe2 100644
--- a/source4/librpc/rpc/dcerpc_schannel.c
+++ b/source4/librpc/rpc/dcerpc_schannel.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_schannel.h"
+#include "auth/auth.h"
 
 enum schannel_position {
 	DCERPC_SCHANNEL_STATE_START = 0,
-- 
cgit