r1516: remove the server_connection from the list on the server_socket

and call talloc_destroy(srv_conn->mem_ctx)

also don't follow NULL pointers

metze
(This used to be commit 786c00c3d4f510c870a45f11af69281298ba176d)

1 files changed, 13 insertions, 2 deletions

diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
index 19306656b5..c12a1f4305 100644
--- a/source4/smbd/process_standard.c
+++ b/source4/smbd/process_standard.c
@@ -91,8 +91,19 @@ static void standard_accept_connection(struct event_context *ev, struct fd_event
 static void standard_terminate_connection(struct server_connection *conn, const char *reason) 
 {
 	DEBUG(0,("single_terminate_connection: reason[%s]\n",reason));
-	conn->service->ops->close_connection(conn,reason);
-	server_destroy_connection(conn);
+
+	if (conn) {
+		if (conn->service) {
+			conn->service->ops->close_connection(conn,reason);
+		}
+
+		if (conn->server_socket) {
+			DLIST_REMOVE(conn->server_socket->connection_list,conn);
+		}
+
+		server_destroy_connection(conn);
+	}
+
 	/* terminate this process */
 	exit(0);
 }