Move DSGETDC_VALID_FLAGS to IDL.

Guenther

diff --git a/source/include/rpc_netlogon.h b/source/include/rpc_netlogon.h
index f0cff0d40a853b33d8b8986c3aea11d0bd330f32..1ad468308dedbe5e394678752a0c49912a5449f3 100644 (file)
--- a/source/include/rpc_netlogon.h
+++ b/source/include/rpc_netlogon.h
@@ -45,25 +45,6 @@ typedef struct hdr_account_lockout_string {
        uint32 buffer;
 } HDR_LOCKOUT_STRING;
 
-#define DSGETDC_VALID_FLAGS ( \
-    DS_FORCE_REDISCOVERY | \
-    DS_DIRECTORY_SERVICE_REQUIRED | \
-    DS_DIRECTORY_SERVICE_PREFERRED | \
-    DS_GC_SERVER_REQUIRED | \
-    DS_PDC_REQUIRED | \
-    DS_BACKGROUND_ONLY | \
-    DS_IP_REQUIRED | \
-    DS_KDC_REQUIRED | \
-    DS_TIMESERV_REQUIRED | \
-    DS_WRITABLE_REQUIRED | \
-    DS_GOOD_TIMESERV_PREFERRED | \
-    DS_AVOID_SELF | \
-    DS_ONLY_LDAP_NEEDED | \
-    DS_IS_FLAT_NAME | \
-    DS_IS_DNS_NAME | \
-    DS_RETURN_FLAT_NAME  | \
-    DS_RETURN_DNS_NAME )
-
 struct DS_DOMAIN_CONTROLLER_INFO {
        const char *domain_controller_name;
        const char *domain_controller_address;

diff --git a/source/librpc/idl/netlogon.idl b/source/librpc/idl/netlogon.idl
index d701b1e1c91a41be0a18316a7e5a8c9e313a2f99..6a7f4207e28eb1733de329c51b4960c410427ed3 100644 (file)
--- a/source/librpc/idl/netlogon.idl
+++ b/source/librpc/idl/netlogon.idl
@@ -940,6 +940,24 @@ interface netlogon
 
        /* one unkown bit still: DS_IP_VERSION_AGNOSTIC - gd*/
 
+       const int DSGETDC_VALID_FLAGS = (DS_FORCE_REDISCOVERY |
+                                        DS_DIRECTORY_SERVICE_REQUIRED |
+                                        DS_DIRECTORY_SERVICE_PREFERRED |
+                                        DS_GC_SERVER_REQUIRED |
+                                        DS_PDC_REQUIRED |
+                                        DS_BACKGROUND_ONLY |
+                                        DS_IP_REQUIRED |
+                                        DS_KDC_REQUIRED |
+                                        DS_TIMESERV_REQUIRED |
+                                        DS_WRITABLE_REQUIRED |
+                                        DS_GOOD_TIMESERV_PREFERRED |
+                                        DS_AVOID_SELF |
+                                        DS_ONLY_LDAP_NEEDED |
+                                        DS_IS_FLAT_NAME |
+                                        DS_IS_DNS_NAME |
+                                        DS_RETURN_FLAT_NAME |
+                                        DS_RETURN_DNS_NAME);
+
        typedef [bitmap32bit] bitmap {
                DS_FORCE_REDISCOVERY            = 0x00000001,
                DS_DIRECTORY_SERVICE_REQUIRED   = 0x00000010,