s4:dsdb/common/util.c - use LDB constants whenever possible

[amitay/samba.git] / libds / common / flags.h

diff --git a/libds/common/flags.h b/libds/common/flags.h
index 6a29b1b5100eec06da24f6cc56ffa649dd31aa56..be1e83917d38173d470b122b22aeb974c97b2f8d 100644 (file)
--- a/libds/common/flags.h
+++ b/libds/common/flags.h
@@ -110,7 +110,7 @@
                GROUP_TYPE_SECURITY_ENABLED \
                )
 #define GTYPE_SECURITY_UNIVERSAL_GROUP ( \
-               /* 0x80000008 -2147483656 */ \
+               /* 0x80000008 -2147483640 */ \
                GROUP_TYPE_UNIVERSAL_GROUP| \
                GROUP_TYPE_SECURITY_ENABLED \
                )
@@ -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