[src/trunk]: src/usr.sbin NI_WITHSCOPEID was not picked up by IETF standardiz...

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

details:   https://anonhg.NetBSD.org/src/rev/48589514c65e
branches:  trunk
changeset: 571294:48589514c65e
user:      itojun <itojun%NetBSD.org@localhost>
date:      Tue Nov 16 06:00:37 2004 +0000

description:
NI_WITHSCOPEID was not picked up by IETF standardization

diffstat:

 usr.sbin/lpr/common_source/common.c |   8 ++------
 usr.sbin/sup/source/scm.c           |  10 +---------
 2 files changed, 3 insertions(+), 15 deletions(-)

diffs (63 lines):

diff -r b397ffec1398 -r 48589514c65e usr.sbin/lpr/common_source/common.c
--- a/usr.sbin/lpr/common_source/common.c       Tue Nov 16 05:59:32 2004 +0000
+++ b/usr.sbin/lpr/common_source/common.c       Tue Nov 16 06:00:37 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: common.c,v 1.26 2003/10/16 06:30:11 itojun Exp $       */
+/*     $NetBSD: common.c,v 1.27 2004/11/16 06:00:37 itojun Exp $       */
 
 /*
  * Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)common.c   8.5 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: common.c,v 1.26 2003/10/16 06:30:11 itojun Exp $");
+__RCSID("$NetBSD: common.c,v 1.27 2004/11/16 06:00:37 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -308,11 +308,7 @@
        static char errbuf[128];
        int error;
        struct ifaddrs *ifap, *ifa;
-#ifdef NI_WITHSCOPEID
-       const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
        const int niflags = NI_NUMERICHOST;
-#endif
 #ifdef __KAME__
        struct sockaddr_in6 sin6;
        struct sockaddr_in6 *sin6p;
diff -r b397ffec1398 -r 48589514c65e usr.sbin/sup/source/scm.c
--- a/usr.sbin/sup/source/scm.c Tue Nov 16 05:59:32 2004 +0000
+++ b/usr.sbin/sup/source/scm.c Tue Nov 16 06:00:37 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scm.c,v 1.19 2004/09/30 02:17:53 enami Exp $   */
+/*     $NetBSD: scm.c,v 1.20 2004/11/16 06:00:37 itojun Exp $  */
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -571,11 +571,7 @@
 {                              /* is remote host same as local host? */
        struct ifaddrs *ifap, *ifa;
        char h1[NI_MAXHOST], h2[NI_MAXHOST];
-#ifdef NI_WITHSCOPEID
-       const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
        const int niflags = NI_NUMERICHOST;
-#endif
 
        if (getnameinfo((struct sockaddr *) &remoteaddr,
 #ifdef BSD4_4
@@ -611,11 +607,7 @@
 matchhost(char *name)
 {                              /* is this name of remote host? */
        char h1[NI_MAXHOST], h2[NI_MAXHOST];
-#ifdef NI_WITHSCOPEID
-       const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
        const int niflags = NI_NUMERICHOST;
-#endif
        struct addrinfo hints, *res0, *res;
 
        if (getnameinfo((struct sockaddr *) & remoteaddr,