Re: [contrack-tools PATCH] build: do not compile nfct if we disabled cttimeout

[Pablo Neira Ayuso <pablo@netfilter.org>]

[-- Attachment #1: Type: text/plain, Size: 861 bytes --]

On Mon, May 12, 2014 at 05:23:54PM +0200, Pablo Neira Ayuso wrote:
> On Sat, May 10, 2014 at 10:51:23AM +0800, Hangbin Liu wrote:
> > On Fri, May 09, 2014 at 03:59:42PM +0200, Pablo Neira Ayuso wrote:
> > > On Fri, May 09, 2014 at 07:54:11PM +0800, Hangbin Liu wrote:
> > > > On Fri, May 09, 2014 at 01:29:59PM +0200, Pablo Neira Ayuso wrote:
> > > > > On Thu, May 08, 2014 at 06:02:25PM +0800, Hangbin Liu wrote:
> > > > > > If we do not have libnetfilter_cttimeout and disabled cttimeout, conntrack-tools
> > > > > > will compile fail because nfct.c include nfnetlink_cttimeout.h. Fix it by only
> > > > > > compile nfct when we have enabled cttimeout
> > > 
> > > OK, I see. That's not nfnetlink_cttimeout.h, it's
> > > libnetfilter_cttimeout.h.
> > 
> > Ah, sorry, my mistake
> 
> Please, give a try to the attached patch.

Now, really attaching the patch.

[-- Attachment #2: 0001-nfct-remove-unneeded-included-header.patch --]
[-- Type: text/x-diff, Size: 796 bytes --]

>From 34a8e200eee54b4bbecadf52bba8901cae129795 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 12 May 2014 17:21:21 +0200
Subject: [PATCH] nfct: remove unneeded included header

This fixes a compilation breakage when libnetfilter_cttimeout.h is
not installed.

Reported-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/nfct.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/src/nfct.c b/src/nfct.c
index 19e44be..533d75d 100644
--- a/src/nfct.c
+++ b/src/nfct.c
@@ -22,8 +22,6 @@
 #include <errno.h>
 
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nfnetlink_cttimeout.h>
-#include <libnetfilter_cttimeout/libnetfilter_cttimeout.h>
 
 #include "linux_list.h"
 #include "nfct.h"
-- 
1.7.10.4