idl: use common netlogon bit definitions

The DS_ bits had got a bit ahead of the NBT_ bits.

Ideally we'd make these a single set of bits at some point.

This also removes NBT_SERVER_DNS_FOREST as this bit doesn't exist. I
think it came from someone mis-reading the docs, which show the bits
in reverse order within bytes (one of the worst bit table
representations I have ever seen!)

diff --git a/librpc/idl/nbt.idl b/librpc/idl/nbt.idl
index fc82b1c8977e88a095827a033dac880c30ff4479..a51132c4d4796df0116bf44fba223ef265cf99ec 100644 (file)
--- a/librpc/idl/nbt.idl
+++ b/librpc/idl/nbt.idl
@@ -357,7 +357,10 @@ interface nbt
                NBT_SERVER_NDNC                         = 0x00000400,
                NBT_SERVER_SELECT_SECRET_DOMAIN_6       = 0x00000800,
                NBT_SERVER_FULL_SECRET_DOMAIN_6         = 0x00001000,
-               NBT_SERVER_DNS_FOREST                   = 0x01000000
+               NBT_SERVER_ADS_WEB_SERVICE              = 0x00002000,
+               NBT_SERVER_HAS_DNS_NAME                 = 0x20000000,
+               NBT_SERVER_IS_DEFAULT_NC                = 0x40000000,
+               NBT_SERVER_FOREST_ROOT                  = 0x80000000
        } nbt_server_type;
 
        typedef [bitmap32bit,public] bitmap {

diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl
index ef2c8a47218dde84508e7d19bd2dc67aba4d0976..b08a8930dcdf3542d67d5063387e89aefd8aae11 100644 (file)
--- a/librpc/idl/netlogon.idl
+++ b/librpc/idl/netlogon.idl
@@ -1142,9 +1142,9 @@ interface netlogon
                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
+               DS_DNS_CONTROLLER                = NBT_SERVER_HAS_DNS_NAME,
+               DS_DNS_DOMAIN                    = NBT_SERVER_IS_DEFAULT_NC,
+               DS_DNS_FOREST_ROOT               = NBT_SERVER_FOREST_ROOT
        } netr_DsR_DcFlags;
 
        typedef [public] struct {