Marcus Meissner
ac2ed23d50
- Update to 1.7.4.4:
* FIX: In error.c msg2() there was a stack overflow on long messages: The
terminating \0 Byte was written behind the last position.
* FIX: UDP-RECVFROM with fork sometimes terminated when multiple packets
arrived.
* FIX: a couple of weaknesses and errors when accessing invalid or
incompatible file system entries with UNIX domain, file, and generic
addresses.
* FIX: bad parser error message on "socat /tmp/x\"x/x -"
- Drop socat-fix-asan-error.patch
OBS-URL: https://build.opensuse.org/request/show/1040684
OBS-URL: https://build.opensuse.org/package/show/network:utilities/socat?expand=0&rev=62
42 lines
986 B
Diff
42 lines
986 B
Diff
Index: socat-1.7.4.4/filan.c
|
|
===================================================================
|
|
--- socat-1.7.4.4.orig/filan.c
|
|
+++ socat-1.7.4.4/filan.c
|
|
@@ -20,6 +20,10 @@
|
|
|
|
#include "filan.h"
|
|
|
|
+#ifdef WITH_LIBWRAP
|
|
+#include <tcpd.h>
|
|
+#endif
|
|
+
|
|
|
|
struct sockopt {
|
|
int so;
|
|
Index: socat-1.7.4.4/procan.c
|
|
===================================================================
|
|
--- socat-1.7.4.4.orig/procan.c
|
|
+++ socat-1.7.4.4/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.4.4/xio-tcpwrap.c
|
|
===================================================================
|
|
--- socat-1.7.4.4.orig/xio-tcpwrap.c
|
|
+++ socat-1.7.4.4/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 };
|