Attachment 11482 Details for Bug 11316 – Patch for ctdbd_connection_destructor in v4-3-test

[patch] Patch for ctdbd_connection_destructor in v4-3-test

tmp43.diff.txt (text/plain), 1.11 KB, created by Stefan Metzmacher on 2015-10-07 06:59:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2015-10-07 06:59:08 UTC

Size: 1.11 KB

patch

obsolete

>From 7410c84674a40ce717858c8b9c11b9b434e380df Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Mon, 5 Oct 2015 15:57:42 +0200
>Subject: [PATCH] s3:ctdbd_conn: make sure we destroy tevent_fd before closing
> the socket
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11316
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: GÃ¼nther Deschner <gd@samba.org>
>(cherry picked from commit 70dbba96e311449575f571db68710584fc991234)
>---
> source3/lib/ctdbd_conn.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
>index 1acce12..c19b6e5 100644
>--- a/source3/lib/ctdbd_conn.c
>+++ b/source3/lib/ctdbd_conn.c
>@@ -421,7 +421,11 @@ static int ctdb_read_req(struct ctdbd_connection *conn, uint32_t reqid,
> 
> static int ctdbd_connection_destructor(struct ctdbd_connection *c)
> {
>-	close(c->fd);
>+	TALLOC_FREE(c->fde);
>+	if (c->fd != -1) {
>+		close(c->fd);
>+		c->fd = -1;
>+	}
> 	return 0;
> }
> /*
>-- 
>1.9.1
>

Flags:

gd: review+
vl: review+

Actions: View

Attachments on bug 11316: 11155 | 11157 | 11161 | 11164 | 11344 | 11345 | 11347 | 11348 | 11480 | 11482 | 11483