You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.7 KiB
52 lines
1.7 KiB
From 6b09724c69d91668418ddb3af00da6db6755208c Mon Sep 17 00:00:00 2001
|
|
From: Steve Grubb <sgrubb@redhat.com>
|
|
Date: Thu, 2 Sep 2021 15:01:12 -0400
|
|
Subject: [PATCH] Make IPX packet interpretation dependent on the ipx header
|
|
file existing
|
|
|
|
--- a/auparse/interpret.c
|
|
+++ b/auparse/interpret.c
|
|
@@ -44,8 +44,10 @@
|
|
#include <linux/ax25.h>
|
|
#include <linux/atm.h>
|
|
#include <linux/x25.h>
|
|
-#include <linux/if.h> // FIXME: remove when ipx.h is fixed
|
|
-#include <linux/ipx.h>
|
|
+#ifdef HAVE_IPX_HEADERS
|
|
+ #include <linux/if.h> // FIXME: remove when ipx.h is fixed
|
|
+ #include <linux/ipx.h>
|
|
+#endif
|
|
#include <linux/capability.h>
|
|
#include <sys/personality.h>
|
|
#include <sys/prctl.h>
|
|
@@ -1158,6 +1160,7 @@ static const char *print_sockaddr(const
|
|
x->sax25_call.ax25_call[6]);
|
|
}
|
|
break;
|
|
+#ifdef HAVE_IPX_HEADERS
|
|
case AF_IPX:
|
|
{
|
|
const struct sockaddr_ipx *ip =
|
|
@@ -1167,6 +1170,7 @@ static const char *print_sockaddr(const
|
|
str, ip->sipx_port, ip->sipx_network);
|
|
}
|
|
break;
|
|
+#endif
|
|
case AF_ATMPVC:
|
|
{
|
|
const struct sockaddr_atmpvc* at =
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -414,6 +414,12 @@ if test x"$LIBWRAP_LIBS" != "x"; then
|
|
AC_DEFINE_UNQUOTED(HAVE_LIBWRAP, [], Define if tcp_wrappers support is enabled )
|
|
fi
|
|
|
|
+# linux/ipx.h - deprecated in 2018
|
|
+AC_CHECK_HEADER(linux/ipx.h, ipx_headers=yes, ipx_headers=no)
|
|
+if test $ipx_headers = yes ; then
|
|
+ AC_DEFINE(HAVE_IPX_HEADERS,1,[IPX packet interpretation])
|
|
+fi
|
|
+
|
|
# See if we want to support lower capabilities for plugins
|
|
LIBCAP_NG_PATH
|
|
|