librpc/idl: Alias the DS_ constants in netlogon.idl to the NBT_SERVER equivilants

Both the NBT_SERVER versions (in python scripts) and DS_ constants are
in use in freeIPA so we can not just drop one for the other without
discussion.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed May 24 01:52:28 UTC 2023 on atb-devel-224

diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl
index 18caae604a24ec8065034389b5c0a8166a359948..3a821c0a90581579783715c5b2dddc040ac7fe86 100644 (file)
--- a/librpc/idl/netlogon.idl
+++ b/librpc/idl/netlogon.idl
@@ -23,6 +23,26 @@ cpp_quote("#define ENC_CLAIMS_SUPPORTED KERB_ENCTYPE_CLAIMS_SUPPORTED")
 cpp_quote("#define ENC_RESOURCE_SID_COMPRESSION_DISABLED KERB_ENCTYPE_RESOURCE_SID_COMPRESSION_DISABLED")
 cpp_quote("#define NETLOGON_SERVER_PIPE_STATE_MAGIC 0x4f555358")
 
+cpp_quote("#define DS_SERVER_PDC NBT_SERVER_PDC")
+cpp_quote("#define DS_SERVER_GC NBT_SERVER_GC")
+cpp_quote("#define DS_SERVER_LDAP NBT_SERVER_LDAP")
+cpp_quote("#define DS_SERVER_DS NBT_SERVER_DS")
+cpp_quote("#define DS_SERVER_KDC NBT_SERVER_KDC")
+cpp_quote("#define DS_SERVER_TIMESERV NBT_SERVER_TIMESERV")
+cpp_quote("#define DS_SERVER_CLOSEST NBT_SERVER_CLOSEST")
+cpp_quote("#define DS_SERVER_WRITABLE NBT_SERVER_WRITABLE")
+cpp_quote("#define DS_SERVER_GOOD_TIMESERV NBT_SERVER_GOOD_TIMESERV")
+cpp_quote("#define DS_SERVER_NDNC NBT_SERVER_NDNC")
+cpp_quote("#define DS_SERVER_SELECT_SECRET_DOMAIN_6 NBT_SERVER_SELECT_SECRET_DOMAIN_6 /* 2008 / RODC */")
+cpp_quote("#define DS_SERVER_FULL_SECRET_DOMAIN_6 NBT_SERVER_FULL_SECRET_DOMAIN_6 /* 2008 */")
+cpp_quote("#define DS_SERVER_WEBSERV NBT_SERVER_ADS_WEB_SERVICE")
+cpp_quote("#define DS_SERVER_DS_8 NBT_SERVER_DS_8 /* 2012 */")
+cpp_quote("#define DS_SERVER_DS_9 NBT_SERVER_DS_9 /* 2012R2 */")
+cpp_quote("#define DS_SERVER_DS_10 NBT_SERVER_DS_10 /* 2016 */")
+cpp_quote("#define DS_DNS_CONTROLLER NBT_SERVER_HAS_DNS_NAME")
+cpp_quote("#define DS_DNS_DOMAIN NBT_SERVER_IS_DEFAULT_NC")
+cpp_quote("#define DS_DNS_FOREST_ROOT NBT_SERVER_FOREST_ROOT")
+
 [
   uuid("12345678-1234-abcd-ef00-01234567cffb"),
   version(1.0),
@@ -1195,28 +1215,6 @@ interface netlogon
                DS_ADDRESS_TYPE_NETBIOS         = 2
        } netr_DsRGetDCNameInfo_AddressType;
 
-       typedef [bitmap32bit] bitmap {
-               DS_SERVER_PDC                    = 0x00000001,
-               DS_SERVER_GC                     = 0x00000004,
-               DS_SERVER_LDAP                   = 0x00000008,
-               DS_SERVER_DS                     = 0x00000010,
-               DS_SERVER_KDC                    = 0x00000020,
-               DS_SERVER_TIMESERV               = 0x00000040,
-               DS_SERVER_CLOSEST                = 0x00000080,
-               DS_SERVER_WRITABLE               = 0x00000100,
-               DS_SERVER_GOOD_TIMESERV          = 0x00000200,
-               DS_SERVER_NDNC                   = 0x00000400,
-               DS_SERVER_SELECT_SECRET_DOMAIN_6 = 0x00000800, /* 2008 / RODC */
-               DS_SERVER_FULL_SECRET_DOMAIN_6   = 0x00001000, /* 2008 / RWDC */
-               DS_SERVER_WEBSERV                = 0x00002000,
-               DS_SERVER_DS_8                   = 0x00004000, /* 2012 */
-               DS_SERVER_DS_9                   = 0x00008000, /* 2012R2 */
-               DS_SERVER_DS_10                  = 0x00010000, /* 2016 */
-               DS_DNS_CONTROLLER                = 0x20000000,
-               DS_DNS_DOMAIN                    = 0x40000000,
-               DS_DNS_FOREST_ROOT               = 0x80000000
-       } netr_DsR_DcFlags;
-
        typedef [public] struct {
                [string,charset(UTF16)] uint16 *dc_unc;
                [string,charset(UTF16)] uint16 *dc_address;