Marcus Meissner
1ae699f4cb
- socat-common-fixes.patch: include tcpd.h where needed to fix -fno-common bsc#1160293 OBS-URL: https://build.opensuse.org/request/show/769978 OBS-URL: https://build.opensuse.org/package/show/network:utilities/socat?expand=0&rev=52
53 lines
1.3 KiB
Diff
53 lines
1.3 KiB
Diff
Index: socat-1.7.3.3/filan.c
|
|
===================================================================
|
|
--- socat-1.7.3.3.orig/filan.c
|
|
+++ socat-1.7.3.3/filan.c
|
|
@@ -20,6 +20,10 @@
|
|
|
|
#include "filan.h"
|
|
|
|
+#ifdef WITH_LIBWRAP
|
|
+#include <tcpd.h>
|
|
+#endif
|
|
+
|
|
|
|
struct sockopt {
|
|
int so;
|
|
@@ -28,10 +32,6 @@ struct sockopt {
|
|
|
|
static int filan_streams_analyze(int fd, FILE *outfile);
|
|
|
|
-/* dirty workaround so we dont get an error on AIX when being linked with
|
|
- libwrap */
|
|
-int allow_severity, deny_severity;
|
|
-
|
|
/* global variables for configuring filan */
|
|
bool filan_followsymlinks;
|
|
bool filan_rawoutput;
|
|
Index: socat-1.7.3.3/procan.c
|
|
===================================================================
|
|
--- socat-1.7.3.3.orig/procan.c
|
|
+++ socat-1.7.3.3/procan.c
|
|
@@ -16,6 +16,9 @@
|
|
#include "filan.h"
|
|
|
|
#include <sys/resource.h>
|
|
+#ifdef WITH_LIBWRAP
|
|
+#include <tcpd.h>
|
|
+#endif
|
|
|
|
#include "procan.h"
|
|
|
|
Index: socat-1.7.3.3/xio-tcpwrap.c
|
|
===================================================================
|
|
--- socat-1.7.3.3.orig/xio-tcpwrap.c
|
|
+++ socat-1.7.3.3/xio-tcpwrap.c
|
|
@@ -13,6 +13,7 @@
|
|
#include "xio-tcpwrap.h"
|
|
|
|
|
|
+
|
|
#if (WITH_TCP || WITH_UDP) && WITH_LIBWRAP
|
|
|
|
const struct optdesc opt_tcpwrappers = { "tcpwrappers", "tcpwrap", OPT_TCPWRAPPERS, GROUP_RANGE, PH_ACCEPT, TYPE_STRING_NULL, OFUNC_SPEC };
|