File: 0004-Better-detection-of-CONFIG_BRIDGE_NETFILTER.patch

package info (click to toggle)
iptables-netflow 2.6-7.2
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 4,632 kB
  • sloc: ansic: 6,831; sh: 896; ruby: 619; makefile: 239
file content (29 lines) | stat: -rw-r--r-- 887 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
From 9ed578818bb826ff56e97a4a2625e408d1482322 Mon Sep 17 00:00:00 2001
From: ABC <abc@openwall.com>
Date: Fri, 22 Oct 2021 16:46:36 +0300
Subject: [PATCH 04/17] Better detection of CONFIG_BRIDGE_NETFILTER

`CONFIG_BRIDGE_NETFILTER' is a tristate, thus just `#ifdef' cannot be used.

Reported-by: https://github.com/lyt0112
Fixes: #184
---
 ipt_NETFLOW.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
index 7982212..91e17c1 100644
--- a/ipt_NETFLOW.c
+++ b/ipt_NETFLOW.c
@@ -87,7 +87,7 @@
 #if defined(CONFIG_NF_NAT_NEEDED) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
 # include <net/netfilter/nf_conntrack_timestamp.h>
 #endif
-#ifndef CONFIG_BRIDGE_NETFILTER
+#if !IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
 # ifdef ENABLE_PHYSDEV_OVER
 #  warning "Requested physdev override is not compiled."
 #  undef ENABLE_PHYSDEV_OVER
-- 
2.39.5