[src/trunk]: src/usr.sbin/tcpdchk conflict resolution after tcp_wrappers upgr...

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/58c3cac8b2e8
branches:  trunk
changeset: 475841:58c3cac8b2e8
user:      itojun <itojun%NetBSD.org@localhost>
date:      Fri Aug 27 16:07:23 1999 +0000

description:
conflict resolution after tcp_wrappers upgrade to 7.6.

diffstat:

 usr.sbin/tcpdchk/Makefile   |  4 +++-
 usr.sbin/tcpdchk/inetcf.c   |  8 +++++---
 usr.sbin/tcpdchk/scaffold.c |  8 ++++----
 usr.sbin/tcpdchk/tcpdchk.c  |  9 +++++----
 4 files changed, 17 insertions(+), 12 deletions(-)

diffs (106 lines):

diff -r 46af30d8f785 -r 58c3cac8b2e8 usr.sbin/tcpdchk/Makefile
--- a/usr.sbin/tcpdchk/Makefile Fri Aug 27 16:06:17 1999 +0000
+++ b/usr.sbin/tcpdchk/Makefile Fri Aug 27 16:07:23 1999 +0000
@@ -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
 SRCS=  tcpdchk.c fakelog.c inetcf.c scaffold.c percent_m.c
@@ -11,3 +11,5 @@
 .include "${.CURDIR}/../../lib/libwrap/Makefile.cflags"
 
 .include <bsd.prog.mk>
+
+CFLAGS=
diff -r 46af30d8f785 -r 58c3cac8b2e8 usr.sbin/tcpdchk/inetcf.c
--- a/usr.sbin/tcpdchk/inetcf.c Fri Aug 27 16:06:17 1999 +0000
+++ b/usr.sbin/tcpdchk/inetcf.c Fri Aug 27 16:07:23 1999 +0000
@@ -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
@@ -10,9 +10,9 @@
 #include <sys/cdefs.h>
 #ifndef lint
 #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
-__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
 
@@ -147,6 +147,8 @@
            if ((path = strtok((char *) 0, whitespace)) == 0)
                continue;
        }
+       if (path[0] == '?')                     /* IRIX optional service */
+           path++;
        if (STR_EQ(path, "internal"))
            continue;
        if (path[strspn(path, "-0123456789")] == 0) {
diff -r 46af30d8f785 -r 58c3cac8b2e8 usr.sbin/tcpdchk/scaffold.c
--- a/usr.sbin/tcpdchk/scaffold.c       Fri Aug 27 16:06:17 1999 +0000
+++ b/usr.sbin/tcpdchk/scaffold.c       Fri Aug 27 16:07:23 1999 +0000
@@ -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.
@@ -9,9 +9,9 @@
 #include <sys/cdefs.h>
 #ifndef lint
 #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
-__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
 
@@ -124,7 +124,7 @@
     }
     if (STR_NE(host, hp->h_name)) {
        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));
 }
diff -r 46af30d8f785 -r 58c3cac8b2e8 usr.sbin/tcpdchk/tcpdchk.c
--- a/usr.sbin/tcpdchk/tcpdchk.c        Fri Aug 27 16:06:17 1999 +0000
+++ b/usr.sbin/tcpdchk/tcpdchk.c        Fri Aug 27 16:07:23 1999 +0000
@@ -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
@@ -19,9 +19,9 @@
 #include <sys/cdefs.h>
 #ifndef lint
 #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
-__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
 
@@ -254,7 +254,8 @@
 #ifdef PROCESS_OPTIONS
            real_verdict = defl_verdict;
            if (sh_cmd) {
-               if ((verdict = setjmp(tcpd_buf)) != 0) {
+               verdict = setjmp(tcpd_buf);
+               if (verdict != 0) {
                    real_verdict = (verdict == AC_PERMIT);
                } else {
                    dry_run = 1;