From f75b46081457cd3801d93c91cce51f3d10976234 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 15 Oct 2008 02:08:24 +0200
Subject: Share misc.idl.

---
 source4/librpc/idl/misc.idl     | 60 -----------------------------------------
 source4/librpc/idl/security.idl |  7 +++++
 2 files changed, 7 insertions(+), 60 deletions(-)
 delete mode 100644 source4/librpc/idl/misc.idl

(limited to 'source4')

diff --git a/source4/librpc/idl/misc.idl b/source4/librpc/idl/misc.idl
deleted file mode 100644
index 791b86466c..0000000000
--- a/source4/librpc/idl/misc.idl
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-  miscellaneous IDL structures
-*/
-
-
-[
-	pointer_default(unique)
-]
-interface misc
-{
-	typedef [public,noprint,gensize,noejs] struct {
-		uint32 time_low;
-		uint16 time_mid;
-		uint16 time_hi_and_version;
-		uint8  clock_seq[2];
-		uint8  node[6];
-	} GUID;
-
-	typedef [public] struct {
-		GUID uuid;
-		uint32 if_version;
-	} ndr_syntax_id;
-
-	typedef [public] struct {
-		uint32 handle_type;
-		GUID   uuid;
-	} policy_handle;
-
-	/* secure channel types */
-	/* Only SEC_CHAN_WKSTA can forward requests to other domains. */
-
-	typedef [public] enum {
-		SEC_CHAN_NULL        = 0,
-		SEC_CHAN_WKSTA       = 2,
-		SEC_CHAN_DNS_DOMAIN  = 3,
-		SEC_CHAN_DOMAIN      = 4,
-		SEC_CHAN_BDC         = 6
-	} netr_SchannelType;
-
-	/* SAM database types */
-	typedef [public,v1_enum] enum {
-		SAM_DATABASE_DOMAIN  = 0, /* Domain users and groups */
-		SAM_DATABASE_BUILTIN = 1, /* BUILTIN users and groups */
-		SAM_DATABASE_PRIVS   = 2 /* Privileges */
-	} netr_SamDatabaseID;
-
-	typedef [public,v1_enum] enum {
-		SAMR_REJECT_OTHER      = 0,
-		SAMR_REJECT_TOO_SHORT  = 1,
-		SAMR_REJECT_IN_HISTORY = 2,
-		SAMR_REJECT_COMPLEXITY = 5
-	} samr_RejectReason;
-
-	/* id used to identify a endpoint, possibly in a cluster */
-	typedef [public] struct {
-		hyper id;
-		uint32 id2;
-		uint32 node;
-	} server_id;
-}
diff --git a/source4/librpc/idl/security.idl b/source4/librpc/idl/security.idl
index ac7641c0af..40aa698176 100644
--- a/source4/librpc/idl/security.idl
+++ b/source4/librpc/idl/security.idl
@@ -252,6 +252,13 @@ interface security
 		uint32 sub_auths[num_auths];
 	} dom_sid;
 
+	/* id used to identify a endpoint, possibly in a cluster */
+	typedef [public] struct {
+		hyper id;
+		uint32 id2;
+		uint32 node;
+	} server_id;
+
 	typedef [bitmap8bit] bitmap {
 		SEC_ACE_FLAG_OBJECT_INHERIT		= 0x01,
 		SEC_ACE_FLAG_CONTAINER_INHERIT		= 0x02,
-- 
cgit