summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-10-01 17:29:56 +1000
committerAndrew Tridgell <tridge@samba.org>2009-10-02 12:01:00 +1000
commit2b332e6dfe25dd3ce33b9cb94e60c4b93bc5e240 (patch)
treec373514ceb603a718a1bad22aed0614baa44d523
parentb529a1e98723c30f965f71fb1e9577edb23219d1 (diff)
downloadsamba-2b332e6dfe25dd3ce33b9cb94e60c4b93bc5e240.tar.gz
samba-2b332e6dfe25dd3ce33b9cb94e60c4b93bc5e240.tar.bz2
samba-2b332e6dfe25dd3ce33b9cb94e60c4b93bc5e240.zip
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!)
-rw-r--r--librpc/idl/nbt.idl5
-rw-r--r--librpc/idl/netlogon.idl6
2 files changed, 7 insertions, 4 deletions
diff --git a/librpc/idl/nbt.idl b/librpc/idl/nbt.idl
index fc82b1c897..a51132c4d4 100644
--- 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 ef2c8a4721..b08a8930dc 100644
--- 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 {