diff options
| author | Dave Craft <wimberosa@gmail.com> | 2011-07-05 21:17:10 -0500 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-07-14 07:05:09 +1000 |
| commit | b52246bf2f75e2a4869bce3e474e6c1c81a492b7 (patch) | |
| tree | 3128b794b4e9d1a10c973720d6c6a2421abc1420 | |
| parent | 8612c6bf56ebfcbf6273d8e7305ee382fa4f807e (diff) | |
| download | samba-b52246bf2f75e2a4869bce3e474e6c1c81a492b7.tar.gz samba-b52246bf2f75e2a4869bce3e474e6c1c81a492b7.tar.bz2 samba-b52246bf2f75e2a4869bce3e474e6c1c81a492b7.zip | |
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>
| -rw-r--r-- | libds/common/flags.h | 20 | ||||
| -rw-r--r-- | source4/dsdb/kcc/kcc_topology.c | 8 |
2 files changed, 20 insertions, 8 deletions
diff --git a/libds/common/flags.h b/libds/common/flags.h index a3ed771c4e..714251dff5 100644 --- 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 6cf3d41158..9697ec12f7 100644 --- 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 |