Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conflict resolution after tcp_wrappers upgrade to 7.6.

This commit is contained in:
itojun 1999-08-27 16:07:23 +00:00
parent b98c263379
commit 5874d1fc54
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/tcpdchk/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.8 1999/02/15 04:00:14 hubertf Exp $ # $NetBSD: Makefile,v 1.9 1999/08/27 16:07:23 itojun Exp $
PROG= tcpdchk PROG= tcpdchk
SRCS= tcpdchk.c fakelog.c inetcf.c scaffold.c percent_m.c SRCS= tcpdchk.c fakelog.c inetcf.c scaffold.c percent_m.c
@ -11,3 +11,5 @@ CPPFLAGS+= -I${.CURDIR}/../../lib/libwrap
.include "${.CURDIR}/../../lib/libwrap/Makefile.cflags" .include "${.CURDIR}/../../lib/libwrap/Makefile.cflags"
.include <bsd.prog.mk> .include <bsd.prog.mk>
CFLAGS=

8
usr.sbin/tcpdchk/inetcf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: inetcf.c,v 1.4 1997/10/11 21:41:37 christos Exp $ */ /* $NetBSD: inetcf.c,v 1.5 1999/08/27 16:07:23 itojun Exp $ */
/* /*
* Routines to parse an inetd.conf or tlid.conf file. This would be a great * Routines to parse an inetd.conf or tlid.conf file. This would be a great
@ -10,9 +10,9 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static char sccsid[] = "@(#) inetcf.c 1.6 96/02/11 17:01:29"; static char sccsid[] = "@(#) inetcf.c 1.7 97/02/12 02:13:23";
#else #else
__RCSID("$NetBSD: inetcf.c,v 1.4 1997/10/11 21:41:37 christos Exp $"); __RCSID("$NetBSD: inetcf.c,v 1.5 1999/08/27 16:07:23 itojun Exp $");
#endif #endif
#endif #endif
@ -147,6 +147,8 @@ char *conf;
if ((path = strtok((char *) 0, whitespace)) == 0) if ((path = strtok((char *) 0, whitespace)) == 0)
continue; continue;
} }
if (path[0] == '?') /* IRIX optional service */
path++;
if (STR_EQ(path, "internal")) if (STR_EQ(path, "internal"))
continue; continue;
if (path[strspn(path, "-0123456789")] == 0) { if (path[strspn(path, "-0123456789")] == 0) {

8
usr.sbin/tcpdchk/scaffold.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scaffold.c,v 1.5 1999/05/09 21:22:53 thorpej Exp $ */ /* $NetBSD: scaffold.c,v 1.6 1999/08/27 16:07:23 itojun Exp $ */
/* /*
* Routines for testing only. Not really industrial strength. * Routines for testing only. Not really industrial strength.
@ -9,9 +9,9 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static char sccs_id[] = "@(#) scaffold.c 1.5 95/01/03 09:13:48"; static char sccs_id[] = "@(#) scaffold.c 1.6 97/03/21 19:27:24";
#else #else
__RCSID("$NetBSD: scaffold.c,v 1.5 1999/05/09 21:22:53 thorpej Exp $"); __RCSID("$NetBSD: scaffold.c,v 1.6 1999/08/27 16:07:23 itojun Exp $");
#endif #endif
#endif #endif
@ -124,7 +124,7 @@ char *host;
} }
if (STR_NE(host, hp->h_name)) { if (STR_NE(host, hp->h_name)) {
tcpd_warn("%s: hostname alias", host); tcpd_warn("%s: hostname alias", host);
tcpd_warn("(official name: %s)", hp->h_name); tcpd_warn("(official name: %.*s)", STRING_LENGTH, hp->h_name);
} }
return (dup_hostent(hp)); return (dup_hostent(hp));
} }

9
usr.sbin/tcpdchk/tcpdchk.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcpdchk.c,v 1.7 1999/05/09 16:07:20 christos Exp $ */ /* $NetBSD: tcpdchk.c,v 1.8 1999/08/27 16:07:23 itojun Exp $ */
/* /*
* tcpdchk - examine all tcpd access control rules and inetd.conf entries * tcpdchk - examine all tcpd access control rules and inetd.conf entries
@ -19,9 +19,9 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static char sccsid[] = "@(#) tcpdchk.c 1.7 96/02/11 17:01:34"; static char sccsid[] = "@(#) tcpdchk.c 1.8 97/02/12 02:13:25";
#else #else
__RCSID("$NetBSD: tcpdchk.c,v 1.7 1999/05/09 16:07:20 christos Exp $"); __RCSID("$NetBSD: tcpdchk.c,v 1.8 1999/08/27 16:07:23 itojun Exp $");
#endif #endif
#endif #endif
@ -254,7 +254,8 @@ struct request_info *request;
#ifdef PROCESS_OPTIONS #ifdef PROCESS_OPTIONS
real_verdict = defl_verdict; real_verdict = defl_verdict;
if (sh_cmd) { if (sh_cmd) {
if ((verdict = setjmp(tcpd_buf)) != 0) { verdict = setjmp(tcpd_buf);
if (verdict != 0) {
real_verdict = (verdict == AC_PERMIT); real_verdict = (verdict == AC_PERMIT);
} else { } else {
dry_run = 1; dry_run = 1;