From d2e5e69ed2deb05c0347f4be15832edc6a542de7 Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Sun, 6 Jun 1999 15:34:58 +0000
Subject: use dot_quad_addr_new() as required

---
 libexec/tcpd/tcpdchk/scaffold.c    | 6 +++---
 libexec/tcpd/tcpdchk/tcpdchk.c     | 7 +++----
 libexec/tcpd/tcpdmatch/tcpdmatch.c | 6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'libexec')

diff --git a/libexec/tcpd/tcpdchk/scaffold.c b/libexec/tcpd/tcpdchk/scaffold.c
index 4d8c62b9d98..14bf223b526 100644
--- a/libexec/tcpd/tcpdchk/scaffold.c
+++ b/libexec/tcpd/tcpdchk/scaffold.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scaffold.c,v 1.1 1997/02/26 06:17:07 downsj Exp $	*/
+/*	$OpenBSD: scaffold.c,v 1.2 1999/06/06 15:34:57 deraadt Exp $	*/
 
  /*
   * Routines for testing only. Not really industrial strength.
@@ -10,7 +10,7 @@
 #if 0
 static char sccs_id[] = "@(#) scaffold.c 1.5 95/01/03 09:13:48";
 #else
-static char rcsid[] = "$OpenBSD: scaffold.c,v 1.1 1997/02/26 06:17:07 downsj Exp $";
+static char rcsid[] = "$OpenBSD: scaffold.c,v 1.2 1999/06/06 15:34:57 deraadt Exp $";
 #endif
 #endif
 
@@ -93,7 +93,7 @@ char   *host;
     /*
      * Host address: translate it to internal form.
      */
-    if ((addr.s_addr = dot_quad_addr(host)) != INADDR_NONE) {
+    if (dot_quad_addr(host, &addr.s_addr)) {
 	h.h_addr_list = addr_list;
 	h.h_addr_list[0] = (char *) &addr;
 	h.h_length = sizeof(addr);
diff --git a/libexec/tcpd/tcpdchk/tcpdchk.c b/libexec/tcpd/tcpdchk/tcpdchk.c
index 56ab3940d54..ff076901616 100644
--- a/libexec/tcpd/tcpdchk/tcpdchk.c
+++ b/libexec/tcpd/tcpdchk/tcpdchk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcpdchk.c,v 1.2 1999/05/23 17:19:23 aaron Exp $	*/
+/*	$OpenBSD: tcpdchk.c,v 1.3 1999/06/06 15:34:57 deraadt Exp $	*/
 
  /*
   * tcpdchk - examine all tcpd access control rules and inetd.conf entries
@@ -20,7 +20,7 @@
 #if 0
 static char sccsid[] = "@(#) tcpdchk.c 1.8 97/02/12 02:13:25";
 #else
-static char rcsid[] = "$OpenBSD: tcpdchk.c,v 1.2 1999/05/23 17:19:23 aaron Exp $";
+static char rcsid[] = "$OpenBSD: tcpdchk.c,v 1.3 1999/06/06 15:34:57 deraadt Exp $";
 #endif
 #endif
 
@@ -431,8 +431,7 @@ char   *pat;
 #endif
 #endif
     } else if ((mask = split_at(pat, '/'))) {	/* network/netmask */
-	if (dot_quad_addr(pat) == INADDR_NONE
-	    || dot_quad_addr(mask) == INADDR_NONE)
+	if (!dot_quad_addr_new(pat, NULL) || !dot_quad_addr_new(mask, NULL))
 	    tcpd_warn("%s/%s: bad net/mask pattern", pat, mask);
     } else if (STR_EQ(pat, "FAIL")) {		/* obsolete */
 	tcpd_warn("FAIL is no longer recognized");
diff --git a/libexec/tcpd/tcpdmatch/tcpdmatch.c b/libexec/tcpd/tcpdmatch/tcpdmatch.c
index 6928bb63999..12c266983b6 100644
--- a/libexec/tcpd/tcpdmatch/tcpdmatch.c
+++ b/libexec/tcpd/tcpdmatch/tcpdmatch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcpdmatch.c,v 1.2 1999/05/23 17:19:23 aaron Exp $	*/
+/*	$OpenBSD: tcpdmatch.c,v 1.3 1999/06/06 15:34:57 deraadt Exp $	*/
 
  /*
   * tcpdmatch - explain what tcpd would do in a specific case
@@ -19,7 +19,7 @@
 #if 0
 static char sccsid[] = "@(#) tcpdmatch.c 1.5 96/02/11 17:01:36";
 #else
-static char rcsid[] = "$OpenBSD: tcpdmatch.c,v 1.2 1999/05/23 17:19:23 aaron Exp $";
+static char rcsid[] = "$OpenBSD: tcpdmatch.c,v 1.3 1999/06/06 15:34:57 deraadt Exp $";
 #endif
 #endif
 
@@ -208,7 +208,7 @@ char  **argv;
      * If a client address is specified, we simulate the effect of client
      * hostname lookup failure.
      */
-    if (dot_quad_addr(client) != INADDR_NONE) {
+    if (dot_quad_addr(client, NULL)) {
 	request_set(&request, RQ_CLIENT_ADDR, client, 0);
 	tcpdmatch(&request);
 	exit(0);
-- 
cgit v1.2.3