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)

3 files changed, 14 insertions, 14 deletions

diff --git a/source4/librpc/idl/misc.idl b/source4/librpc/idl/misc.idl
index ce884b6c5ce..dd31f0f54aa 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 b880698ffd3..7f04d2b6482 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 4d41e389e6e..df33066a124 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;