NTDSConnection and NTDSA Site setting flags

Flags that were missing from flags.h or were incorrectly
defined inline to the kcc_topology.c code (and thus unusable
elsewhere).   These are the NTDSConnection and NTDSDSA Site
settings flags.

Signed-off-by: Andrew Tridgell <tridge@samba.org>

diff --git a/libds/common/flags.h b/libds/common/flags.h
index a3ed771c4ed02e9ec03e73db9629fa6914612b9c..714251dff554984cba42d312f4983983f75e3154 100644 (file)
--- a/libds/common/flags.h
+++ b/libds/common/flags.h
@@ -185,6 +185,18 @@
 #define DS_FLAG_ATTR_REQ_PARTIAL_SET_MEMBER 0x00000002
 #define DS_FLAG_ATTR_IS_CONSTRUCTED    0x00000004
 
+/* 7.1.1.2.2.1.1               nTDSSiteSettings Object options */
+#define DS_NTDSSETTINGS_OPT_IS_AUTO_TOPOLOGY_DISABLED                  0x00000001
+#define DS_NTDSSETTINGS_OPT_IS_TOPL_CLEANUP_DISABLED                   0x00000002
+#define DS_NTDSSETTINGS_OPT_IS_TOPL_MIN_HOPS_DISABLED                  0x00000004
+#define DS_NTDSSETTINGS_OPT_IS_TOPL_DETECT_STALE_DISABLED              0x00000008
+#define DS_NTDSSETTINGS_OPT_IS_INTER_SITE_AUTO_TOPOLOGY_DISABLED       0x00000010
+#define DS_NTDSSETTINGS_OPT_IS_GROUP_CACHING_ENABLED                   0x00000020
+#define DS_NTDSSETTINGS_OPT_FORCE_KCC_WHISTLER_BEHAVIOR                        0x00000040
+#define DS_NTDSSETTINGS_OPT_IS_RAND_BH_SELECTION_DISABLED              0x00000100
+#define DS_NTDSSETTINGS_OPT_IS_SCHEDULE_HASHING_ENABLED                        0x00000200
+#define DS_NTDSSETTINGS_OPT_IS_REDUNDANT_SERVER_TOPOLOGY_ENABLED       0x00000400
+
 /* 7.1.1.2.2.1.2.1.1           nTDSDSA Object options flags */
 #define DS_NTDSDSA_OPT_IS_GC                    0x00000001
 #define DS_NTDSDSA_OPT_DISABLE_INBOUND_REPL     0x00000002
@@ -240,3 +252,11 @@
 #define NTDSCONN_KCC_SERVER_FAILOVER_TOPOLOGY        0x00000080
 #define NTDSCONN_KCC_SITE_FAILOVER_TOPOLOGY          0x00000100
 #define NTDSCONN_KCC_REDUNDANT_SERVER_TOPOLOGY       0x00000200
+
+#define NTDSCONN_OPT_IS_GENERATED                      0x00000001
+#define NTDSCONN_OPT_TWOWAY_SYNC                       0x00000002
+#define NTDSCONN_OPT_OVERRIDE_NOTIFY_DEFAULT           0x00000004
+#define NTDSCONN_OPT_USE_NOTIFY                                0x00000008
+#define NTDSCONN_OPT_DISABLE_INTERSITE_COMPRESSION     0x00000010
+#define NTDSCONN_OPT_USER_OWNED_SCHEDULE               0x00000020
+#define NTDSCONN_OPT_RODC_TOPOLOGY                     0x00000040

diff --git a/source4/dsdb/kcc/kcc_topology.c b/source4/dsdb/kcc/kcc_topology.c
index 6cf3d4115806ee5afe96c7fec20df18c30d4ecc0..9697ec12f70d3222f6bd4dd89de36b259cb1df78 100644 (file)
--- a/source4/dsdb/kcc/kcc_topology.c
+++ b/source4/dsdb/kcc/kcc_topology.c
@@ -29,14 +29,6 @@
 #define FLAG_CR_NTDS_NC 0x00000001
 #define FLAG_CR_NTDS_DOMAIN 0x00000002
 
-#define NTDSCONN_OPT_IS_GENERATED 0x00000001
-#define NTDSCONN_OPT_TWOWAY_SYNC 0x00000002
-#define NTDSCONN_OPT_OVERRIDE_NOTIFY_DEFAULT 0x00000004
-#define NTDSCONN_OPT_USE_NOTIFY 0x00000008
-#define NTDSCONN_OPT_DISABLE_INTERSITE_COMPRESSION 0x00000010
-#define NTDSCONN_OPT_USER_OWNED_SCHEDULE 0x00000020
-#define NTDSCONN_OPT_RODC_TOPOLOGY 0x00000040
-
 #define NTDSDSA_OPT_IS_GC 0x00000001
 
 #define NTDSSETTINGS_OPT_IS_TOPL_DETECT_STALE_DISABLED 0x00000008