From: Chris Boot <bootc@bootc.net>
Date: Mon, 18 Nov 2013 11:09:14 +0000 (+0000)
Subject: ulogd: ulogd_inppkt_NFLOG: close nflog handle after unbinding
X-Git-Tag: ulogd-2.0.3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f482f35b63b11273750f66e748f2f0b70c05f352;p=thirdparty%2Fulogd2.git

ulogd: ulogd_inppkt_NFLOG: close nflog handle after unbinding

The nflog handle is closed, and then nflog_unbind_pf() is called on it, which
triggers an assertion failure within libnfnetlink. This patch simply moves
the nflog_close() just after the nflog_unbind_pf() calls.

Signed-off-by: Chris Boot <bootc@bootc.net>
---

diff --git a/input/packet/ulogd_inppkt_NFLOG.c b/input/packet/ulogd_inppkt_NFLOG.c
index cc0c2d4..6196626 100644
--- a/input/packet/ulogd_inppkt_NFLOG.c
+++ b/input/packet/ulogd_inppkt_NFLOG.c
@@ -618,12 +618,12 @@ static int start(struct ulogd_pluginstance *upi)
 	return 0;
 
 out_bind:
-	nflog_close(ui->nful_h);
 	if (group_ce(upi->config_kset).u.value == 0) {
 		nflog_unbind_pf(ui->nful_h, AF_INET);
 		nflog_unbind_pf(ui->nful_h, AF_INET6);
 		nflog_unbind_pf(ui->nful_h, AF_BRIDGE);
 	}
+	nflog_close(ui->nful_h);
 out_handle:
 	free(ui->nfulog_buf);
 out_buf: