From 6a1fa33bae961bb83c687567b300be1d10620e78 Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Wed, 30 Apr 2008 00:56:31 +0200
Subject: [PATCH] IDL: move some netlogon DS flags to NBT where they actually
 showup first.

Guenther
(cherry picked from commit 163f17f84bc602f9944153854e42cf643c5c4768)
---
 source/librpc/idl/nbt.idl      | 21 ++++++++++++---------
 source/librpc/idl/netlogon.idl |  6 +++---
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/source/librpc/idl/nbt.idl b/source/librpc/idl/nbt.idl
index 270d8fe2433..7491324bce3 100644
--- a/source/librpc/idl/nbt.idl
+++ b/source/librpc/idl/nbt.idl
@@ -397,15 +397,18 @@ interface nbt
 	} nbt_netlogon_response_from_pdc;
 
 	typedef [bitmap32bit] bitmap {
-		NBT_SERVER_PDC           = 0x00000001,
-		NBT_SERVER_GC            = 0x00000004,
-		NBT_SERVER_LDAP          = 0x00000008,
-		NBT_SERVER_DS            = 0x00000010,
-		NBT_SERVER_KDC           = 0x00000020,
-		NBT_SERVER_TIMESERV      = 0x00000040,
-		NBT_SERVER_CLOSEST       = 0x00000080,
-		NBT_SERVER_WRITABLE      = 0x00000100,
-		NBT_SERVER_GOOD_TIMESERV = 0x00000200
+		NBT_SERVER_PDC				= 0x00000001,
+		NBT_SERVER_GC				= 0x00000004,
+		NBT_SERVER_LDAP				= 0x00000008,
+		NBT_SERVER_DS				= 0x00000010,
+		NBT_SERVER_KDC				= 0x00000020,
+		NBT_SERVER_TIMESERV			= 0x00000040,
+		NBT_SERVER_CLOSEST			= 0x00000080,
+		NBT_SERVER_WRITABLE			= 0x00000100,
+		NBT_SERVER_GOOD_TIMESERV		= 0x00000200,
+		NBT_SERVER_NDNC				= 0x00000400,
+		NBT_SERVER_SELECT_SECRET_DOMAIN_6	= 0x00000800,
+		NBT_SERVER_FULL_SECRET_DOMAIN_6		= 0x00001000
 	} nbt_server_type;
 
 	/* response from pdc - type2 */
diff --git a/source/librpc/idl/netlogon.idl b/source/librpc/idl/netlogon.idl
index c75aea360c4..98cf1e7d320 100644
--- a/source/librpc/idl/netlogon.idl
+++ b/source/librpc/idl/netlogon.idl
@@ -1025,9 +1025,9 @@ interface netlogon
 		DS_SERVER_CLOSEST		 = NBT_SERVER_CLOSEST,
 		DS_SERVER_WRITABLE		 = NBT_SERVER_WRITABLE,
 		DS_SERVER_GOOD_TIMESERV		 = NBT_SERVER_GOOD_TIMESERV,
-		DS_SERVER_NDNC			 = 0x00000400,
-		DS_SERVER_SELECT_SECRET_DOMAIN_6 = 0x00000800,
-		DS_SERVER_FULL_SECRET_DOMAIN_6	 = 0x00001000,
+		DS_SERVER_NDNC			 = NBT_SERVER_NDNC,
+		DS_SERVER_SELECT_SECRET_DOMAIN_6 = NBT_SERVER_SELECT_SECRET_DOMAIN_6,
+		DS_SERVER_FULL_SECRET_DOMAIN_6	 = NBT_SERVER_FULL_SECRET_DOMAIN_6,
 		DS_DNS_CONTROLLER		 = 0x20000000,
 		DS_DNS_DOMAIN			 = 0x40000000,
 		DS_DNS_FOREST			 = 0x80000000
-- 
2.11.4.GIT