r3356: in the standard process model we need to make sure we close all

listening sockets after the fork to prevent the child still listening
on incoming requests.

I have also added an optimisation where we use dup()/close() to lower
the file descriptor number of the new socket to the lowest possible
after closing our listening sockets. This keeps the max fd num passed
to select() low, which makes a difference to the speed of select().
(This used to be commit f2a9bbc317ba86ebe87c3ca27a3a0192de91014d)

1 files changed, 21 insertions, 0 deletions

diff --git a/source4/smbd/service.c b/source4/smbd/service.c
index ac46992261..ca5f5e7531 100644
--- a/source4/smbd/service.c
+++ b/source4/smbd/service.c
@@ -77,6 +77,8 @@ struct server_context *server_service_startup(const char *model)
 		
 		/* TODO: service_init() should return a result */
 		service->ops->service_init(service, model_ops);
+
+		DLIST_ADD(srv_ctx->service_list, service);
 	}
 
 	return srv_ctx;
@@ -328,3 +330,22 @@ BOOL server_service_init(void)
 	DEBUG(3,("SERVER SERVICE subsystem version %d initialised\n", SERVER_SERVICE_VERSION));
 	return True;
 }
+
+
+/*
+  close all listening sockets. This is called by process models that fork, to 
+  ensure that the listen sockets from the parent are closed
+*/
+void service_close_listening_sockets(struct server_context *srv_ctx)
+{
+	struct server_service *svc;
+	for (svc=srv_ctx->service_list;svc;svc=svc->next) {
+		struct server_socket *sock;
+		for (sock=svc->socket_list;sock;sock=sock->next) {
+			event_remove_fd(sock->event.ctx, sock->event.fde);
+			sock->event.fde = NULL;
+			socket_destroy(sock->socket);
+			sock->socket = NULL;
+		}
+	}
+}