summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-11-13 22:26:24 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:45:10 +0100
commit5294e82e21aa5cf891f27f3e3f63c745efdb66c8 (patch)
tree873b0f332c848eb974fde2fdfc1e107bf6b869f4
parent6c411949612f60ed970aca5f697cd5c37d2d203c (diff)
downloadsamba-5294e82e21aa5cf891f27f3e3f63c745efdb66c8.tar.gz
samba-5294e82e21aa5cf891f27f3e3f63c745efdb66c8.tar.bz2
samba-5294e82e21aa5cf891f27f3e3f63c745efdb66c8.zip
r25938: We don't need the CLDAP server unless we are a DC.
Andrew Bartlett (This used to be commit e8606bbcc67e24bdc2ee062ab3d808e5d2143d69)
-rw-r--r--source4/cldap_server/cldap_server.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index 466444ace8..454beb3ae2 100644
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -159,6 +159,18 @@ static void cldapd_task_init(struct task_server *task)
return;
}
+ switch (lp_server_role(global_loadparm)) {
+ case ROLE_STANDALONE:
+ task_server_terminate(task, "cldap_server: no CLDAP server required in standalone configuration");
+ return;
+ case ROLE_DOMAIN_MEMBER:
+ task_server_terminate(task, "cldap_server: no CLDAP server required in member server configuration");
+ return;
+ case ROLE_DOMAIN_CONTROLLER:
+ /* Yes, we want an CLDAP server */
+ break;
+ }
+
task_server_set_title(task, "task[cldapd]");
cldapd = talloc(task, struct cldapd_server);