Fix configure script and "make check" for TCP Wrappers

Add missing #include's and static variables.

Problem spotted on OpenBSD.

(cherry picked from commit e747fe92775f577a38f8dd681f7a58f751348f5e)

Conflicts:
	configure.ng
	src/portab/portabtest.c

diff --git a/configure.ng b/configure.ng
index 8f4585a7c7800ae964693ad20c6014654aa93ac5..f6d83468445067739bee702f683eb523ff24373c 100644 (file)
--- a/configure.ng
+++ b/configure.ng
@@ -467,6 +467,8 @@ AC_ARG_WITH(tcp-wrappers,
                        LIBS="-lwrap $LIBS"
                        LIBS_END="-lwrap $LIBS_END"
                        AC_TRY_LINK([
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <tcpd.h>
 int allow_severity = 0;
 int deny_severity = 0;

diff --git a/src/portab/portabtest.c b/src/portab/portabtest.c
index 09afbfd18cb13d1c70495c2175e8df5422d4dd00..b55ff9790c551f7d461088f611595014eb616906 100644 (file)
--- a/src/portab/portabtest.c
+++ b/src/portab/portabtest.c
@@ -24,6 +24,8 @@
 
 #include "exp.h"
 
+int allow_severity = 0, deny_severity = 0;
+
 
 static void Panic PARAMS (( char *Reason, int Code ));