summaryrefslogtreecommitdiff
path: root/source4/dsdb/kcc
diff options
context:
space:
mode:
authorDave Craft <wimberosa@gmail.com>2011-07-05 21:39:05 -0500
committerAndrew Tridgell <tridge@samba.org>2011-07-14 00:19:12 +0200
commit1838e16f34544c824615481f618c89ed6e062013 (patch)
tree46a21fdb74ddf89f2c9275acd798dca387164346 /source4/dsdb/kcc
parentc8413b3420d7401fe3b9588a7832d1e30e76a501 (diff)
downloadsamba-1838e16f34544c824615481f618c89ed6e062013.tar.gz
samba-1838e16f34544c824615481f618c89ed6e062013.tar.bz2
samba-1838e16f34544c824615481f618c89ed6e062013.zip
Add intrasite code test switch
kcc_service struct gets a intrasite_code boolean that is filled in via parametric parameter kccsrv:intrasite = [true/false] in smb.conf. This will allow us to continue to utilize old simple KCC topology as continuing default while newer intra-site topology matures further. Signed-off-by: Andrew Tridgell <tridge@samba.org> Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Thu Jul 14 00:19:12 CEST 2011 on sn-devel-104
Diffstat (limited to 'source4/dsdb/kcc')
-rw-r--r--source4/dsdb/kcc/kcc_service.c6
-rw-r--r--source4/dsdb/kcc/kcc_service.h3
2 files changed, 9 insertions, 0 deletions
diff --git a/source4/dsdb/kcc/kcc_service.c b/source4/dsdb/kcc/kcc_service.c
index b2360d81cd..5f7b537d14 100644
--- a/source4/dsdb/kcc/kcc_service.c
+++ b/source4/dsdb/kcc/kcc_service.c
@@ -235,6 +235,12 @@ static void kccsrv_task_init(struct task_server *task)
return;
}
+ /* (kccsrv:intrasite=true) will run newer intrasite replication
+ * topology code.
+ */
+ service->intrasite_code = lpcfg_parm_bool(task->lp_ctx, NULL, "kccsrv",
+ "intrasite", false);
+
irpc_add_name(task->msg_ctx, "kccsrv");
IRPC_REGISTER(task->msg_ctx, drsuapi, DRSUAPI_DSEXECUTEKCC, kccsrv_execute_kcc, service);
diff --git a/source4/dsdb/kcc/kcc_service.h b/source4/dsdb/kcc/kcc_service.h
index f56488560a..1404a9a3cd 100644
--- a/source4/dsdb/kcc/kcc_service.h
+++ b/source4/dsdb/kcc/kcc_service.h
@@ -82,6 +82,9 @@ struct kccsrv_service {
time_t last_deleted_check;
bool am_rodc;
+
+ /* run new intra-site topology code */
+ bool intrasite_code;
};
struct kcc_connection_list;