aboutsummaryrefslogtreecommitdiffstats
path: root/libds
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-06-21 20:19:02 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-06-23 20:10:03 +1000
commitc4482bf53e26c43edccb0871fa5525a590a1026c (patch)
tree37364ab94d8501b268a3ebd0bc213782f6066c4c /libds
parent80701e5f29567e4ad75a66eb6c8711f817b361b8 (diff)
downloadsamba-c4482bf53e26c43edccb0871fa5525a590a1026c.tar.gz
samba-c4482bf53e26c43edccb0871fa5525a590a1026c.tar.xz
samba-c4482bf53e26c43edccb0871fa5525a590a1026c.zip
libds:common Remove DS_DC_* domain functionality flags
These are just a subset of the DS_DOMAIN_ functionality flags, are compared and often confused with each other. Just make them one set. Andrew Bartlett
Diffstat (limited to 'libds')
-rw-r--r--libds/common/flags.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/libds/common/flags.h b/libds/common/flags.h
index 396df7c1a98..be1e83917d3 100644
--- a/libds/common/flags.h
+++ b/libds/common/flags.h
@@ -170,19 +170,15 @@
#define SEARCH_FLAG_NEVERVALUEAUDIT 0x0000100
#define SEARCH_FLAG_RODC_ATTRIBUTE 0x0000200
-/* "domainFunctionality", "forestFunctionality" in the rootDSE */
+/* "domainFunctionality", "forestFunctionality" and "domainControllerFunctionality" in the rootDSE */
#define DS_DOMAIN_FUNCTION_2000 0
-#define DS_DOMAIN_FUNCTION_2003_MIXED 1
+#define DS_DOMAIN_FUNCTION_2003_MIXED 1 /* Not a valid/meaningfulxs
+ * domainControllerFunctionality
+ * Level */
#define DS_DOMAIN_FUNCTION_2003 2
#define DS_DOMAIN_FUNCTION_2008 3
#define DS_DOMAIN_FUNCTION_2008_R2 4
-/* "domainControllerFunctionality" in the rootDSE */
-#define DS_DC_FUNCTION_2000 0
-#define DS_DC_FUNCTION_2003 2
-#define DS_DC_FUNCTION_2008 3
-#define DS_DC_FUNCTION_2008_R2 4
-
/* sa->systemFlags on attributes */
#define DS_FLAG_ATTR_NOT_REPLICATED 0x00000001
#define DS_FLAG_ATTR_REQ_PARTIAL_SET_MEMBER 0x00000002