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

diff --git a/source4/dsdb/kcc/kcc_service.c b/source4/dsdb/kcc/kcc_service.c
index b2360d81cd16b6ff20e2b9c01a5877dc109a5192..5f7b537d14616a30cdec15af8c3ee12a77fc1315 100644 (file)
--- 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 f56488560abe5c2785a1da6e115cd54c384150ab..1404a9a3cd44c882bc5d75aa650adebc611a20b3 100644 (file)
--- 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;