From: Günther Deschner <gd@samba.org>
Date: Thu, 27 Mar 2008 11:04:22 +0000 (+0100)
Subject: Move DSGETDC_VALID_FLAGS to IDL.
X-Git-Tag: samba-3.3.0pre1~3080
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a14b00ee19c6dc23ff687e57e8e6340702056317;p=thirdparty%2Fsamba.git

Move DSGETDC_VALID_FLAGS to IDL.

Guenther
---

diff --git a/source/include/rpc_netlogon.h b/source/include/rpc_netlogon.h
index f0cff0d40a8..1ad468308de 100644
--- 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 d701b1e1c91..6a7f4207e28 100644
--- 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,