svn commit: samba r25938 - in branches/SAMBA_4_0/source/cldap_server: .

[abartlet at samba.org]

Author: abartlet
Date: 2007-11-13 22:26:24 +0000 (Tue, 13 Nov 2007)
New Revision: 25938

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25938

Log:
We don't need the CLDAP server unless we are a DC.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/cldap_server/cldap_server.c


Changeset:
Modified: branches/SAMBA_4_0/source/cldap_server/cldap_server.c
===================================================================
--- branches/SAMBA_4_0/source/cldap_server/cldap_server.c	2007-11-13 21:27:37 UTC (rev 25937)
+++ branches/SAMBA_4_0/source/cldap_server/cldap_server.c	2007-11-13 22:26:24 UTC (rev 25938)
@@ -159,6 +159,18 @@
 		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);