diff options
| author | Serhey Popovych <serhe.popovych@gmail.com> | 2018-11-18 21:08:23 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2018-11-26 11:03:26 +0100 |
| commit | bad58fb5a6e318e33a5be150bb6d0c0482b0a2d6 (patch) | |
| tree | 369b9ca2bfa7ea5915c853115bc17bbeacf8da27 | |
| parent | 3713072d3bcb5dc1cfbb7c5fa3e24b8a73fd4104 (diff) | |
configure.ac: Fix build regression on RHEL/CentOS/SL
This was introduced with commit 0f82228387ae ("Use more robust awk
patterns to check for backward compatibility") on RHEL 7.3+ because
it's kernel contains backported upstream commit 633c9a840d0b
("netfilter: nfnetlink: avoid recurrent netns lookups in call_batch")
that introduces @net of @struct net type parameter matched with $GREP
after $AWK returns whole @struct nfnl_callback.
This causes incorrect IPSET_CBFN() prototype choose for ->call()
of @struct nfnl_callback producing following warnings during the build:
.../ipset/ip_set_core.c:2007:3: warning: initialization from
incompatible pointer type [enabled by default]
.call = ip_set_destroy,
^
../ipset/ip_set_core.c:2007:3: warning: (near initialization
for ‘ip_set_netlink_subsys_cb[3].call’) [enabled by default]
Fix by matching pattern to the end of first function pointer in
@struct nfnl_callback instead of end of struct.
Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 5a74e6e..f570591 100644 --- a/configure.ac +++ b/configure.ac @@ -496,9 +496,9 @@ else AC_SUBST(HAVE_NLA_PUT_IN_ADDR, undef) fi -AC_MSG_CHECKING([kernel source for struct net in struct nfnl_callback]) +AC_MSG_CHECKING([kernel source for struct net in the call() function in struct nfnl_callback]) if test -f $ksourcedir/include/linux/netfilter/nfnetlink.h && \ - $AWK '/^struct nfnl_callback /,/^}/' $ksourcedir/include/linux/netfilter/nfnetlink.h | \ + $AWK '/^struct nfnl_callback /,/\);$/' $ksourcedir/include/linux/netfilter/nfnetlink.h | \ $GREP -q 'struct net'; then AC_MSG_RESULT(yes) AC_SUBST(HAVE_NET_IN_NFNL_CALLBACK_FN, define) |