Oh, impolitic profanities... Solaris doesn't know about INADDR_NONE either.

"Sun, the dot in half-a-decade-behind-the-rest-of-the-world.com"
This commit is contained in:
abs 1999-11-09 19:29:57 +00:00
parent d6d150908a
commit ddfa34a912
2 changed files with 5 additions and 5 deletions

View file

@ -1,7 +1,7 @@
$NetBSD: patch-sum,v 1.5 1999/11/09 17:22:15 abs Exp $
$NetBSD: patch-sum,v 1.6 1999/11/09 19:29:57 abs Exp $
MD5 (patch-aa) = ebd4b9f4a796be4616eb8e7dfcd94ff1
MD5 (patch-ab) = ce6f24895e645758ebd608a361b55cd5
MD5 (patch-ac) = 8e21f9df160a1c36d7e8da66445bd792
MD5 (patch-ad) = eba2870b3430abcdd3ed94ecec4dadbe
MD5 (patch-ad) = b9992ff1c51e27d616579bc5e3005f11
MD5 (patch-ae) = a0809132cb27e911e5712252068d3e4c

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ad,v 1.2 1999/11/09 17:22:16 abs Exp $
$NetBSD: patch-ad,v 1.3 1999/11/09 19:29:57 abs Exp $
--- src/misc.c.orig Tue Sep 14 09:46:53 1999
+++ src/misc.c Tue Nov 9 16:27:25 1999
@@ -652,3 +652,41 @@
@ -28,8 +28,8 @@ $NetBSD: patch-ad,v 1.2 1999/11/09 17:22:16 abs Exp $
+ */
+
+ /* This is also a convenient method to ensure valid dotted quad */
+if ( (nm.s_addr = inet_addr(netmask)) != INADDR_NONE &&
+ (ip.s_addr = inet_addr(VIPADDRESS)) != INADDR_NONE )
+if ( (nm.s_addr = inet_addr(netmask)) != -1 &&
+ (ip.s_addr = inet_addr(VIPADDRESS)) != -1 )
+ {
+ ip.s_addr &= nm.s_addr; /* Will not work with IPv6 */
+ strcpy(ipbuf,inet_ntoa(ip));