From a1748ef743b3d2e2af0880a91f948062d314b5ee Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 15 Jul 2004 08:28:19 +0000 Subject: r1514: close stuff from the server_connection not in the close_connection fn of a specific service metze (This used to be commit 0e1f5e66d37deb7a77ae9f545e60685428fd9d21) --- source4/smbd/process_single.c | 3 +++ source4/smbd/process_standard.c | 3 +++ source4/smbd/process_thread.c | 3 +++ 3 files changed, 9 insertions(+) (limited to 'source4/smbd') diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c index b65418cd01..1cba3faee3 100644 --- a/source4/smbd/process_single.c +++ b/source4/smbd/process_single.c @@ -122,6 +122,9 @@ static void single_terminate_connection(struct server_connection *conn, const ch { DEBUG(0,("single_terminate_connection: reason[%s]\n",reason)); conn->service->ops->close_connection(conn,reason); + close(conn->event.fde->fd); + event_remove_fd(conn->event.ctx, conn->event.fde); + event_remove_timed(conn->event.ctx, conn->event.idle); } static int single_get_id(struct smbsrv_request *req) diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c index 5c2a0a3410..424d0b417a 100644 --- a/source4/smbd/process_standard.c +++ b/source4/smbd/process_standard.c @@ -146,6 +146,9 @@ static void standard_terminate_connection(struct server_connection *conn, const { DEBUG(0,("single_terminate_connection: reason[%s]\n",reason)); conn->service->ops->close_connection(conn,reason); + close(conn->event.fde->fd); + event_remove_fd(conn->event.ctx, conn->event.fde); + event_remove_timed(conn->event.ctx, conn->event.idle); /* terminate this process */ exit(0); } diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c index 553e67feeb..2ba9905f1f 100644 --- a/source4/smbd/process_thread.c +++ b/source4/smbd/process_thread.c @@ -162,6 +162,9 @@ static void thread_terminate_connection(struct server_connection *conn, const ch { DEBUG(0,("thread_terminate_connection: reason[%s]\n",reason)); conn->service->ops->close_connection(conn,reason); + close(conn->event.fde->fd); + event_remove_fd(conn->event.ctx, conn->event.fde); + event_remove_timed(conn->event.ctx, conn->event.idle); /* terminate this thread */ pthread_exit(NULL); /* thread cleanup routine will do actual cleanup */ } -- cgit