svn commit: samba r17644 - in branches/SAMBA_4_0/source/ldap_server: .

[tridge at samba.org]

Author: tridge
Date: 2006-08-21 01:25:20 +0000 (Mon, 21 Aug 2006)
New Revision: 17644

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

Log:

change the ldap server to always use the single process model. We are
not aiming to produce a high performance parallel ldap server, so
better to reserve the extra CPUs on a SMP box for file serving.

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


Changeset:
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_server.c
===================================================================
--- branches/SAMBA_4_0/source/ldap_server/ldap_server.c	2006-08-21 01:00:30 UTC (rev 17643)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_server.c	2006-08-21 01:25:20 UTC (rev 17644)
@@ -31,6 +31,7 @@
 #include "smbd/service_task.h"
 #include "smbd/service_stream.h"
 #include "smbd/service.h"
+#include "smbd/process_model.h"
 #include "lib/tls/tls.h"
 #include "lib/messaging/irpc.h"
 #include "lib/ldb/include/ldb.h"
@@ -472,9 +473,14 @@
 {	
 	struct ldapsrv_service *ldap_service;
 	NTSTATUS status;
+	const struct model_ops *model_ops;
 
 	task_server_set_title(task, "task[ldapsrv]");
 
+	/* run the ldap server as a single process */
+	model_ops = process_model_byname("single");
+	if (!model_ops) goto failed;
+
 	ldap_service = talloc_zero(task, struct ldapsrv_service);
 	if (ldap_service == NULL) goto failed;
 
@@ -491,11 +497,11 @@
 		*/
 		for(i = 0; i < num_interfaces; i++) {
 			const char *address = iface_n_ip(i);
-			status = add_socket(task->event_ctx, task->model_ops, address, ldap_service);
+			status = add_socket(task->event_ctx, model_ops, address, ldap_service);
 			if (!NT_STATUS_IS_OK(status)) goto failed;
 		}
 	} else {
-		status = add_socket(task->event_ctx, task->model_ops, lp_socket_address(), ldap_service);
+		status = add_socket(task->event_ctx, model_ops, lp_socket_address(), ldap_service);
 		if (!NT_STATUS_IS_OK(status)) goto failed;
 	}