[src/trunk]: src/lib/libc/net Re-enable resolv.conf sortlist support in getho...

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

details:   https://anonhg.NetBSD.org/src/rev/7ffe53f1adeb
branches:  trunk
changeset: 584406:7ffe53f1adeb
user:      tsarna <tsarna%NetBSD.org@localhost>
date:      Thu Sep 15 15:25:40 2005 +0000

description:
Re-enable resolv.conf sortlist support in gethostbyname().

Fixes first part of PR#31184.  addrsort() was not exposed to the rest of
libc as it turns out not to be usable for getaddrinfo(), so a different
sorter will be implemented for that.

diffstat:

 lib/libc/net/gethnamaddr.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 8a51602a78a8 -r 7ffe53f1adeb lib/libc/net/gethnamaddr.c
--- a/lib/libc/net/gethnamaddr.c        Thu Sep 15 15:14:37 2005 +0000
+++ b/lib/libc/net/gethnamaddr.c        Thu Sep 15 15:25:40 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gethnamaddr.c,v 1.65 2005/06/01 04:39:36 lukem Exp $   */
+/*     $NetBSD: gethnamaddr.c,v 1.66 2005/09/15 15:25:40 tsarna Exp $  */
 
 /*
  * ++Copyright++ 1985, 1988, 1993
@@ -57,7 +57,7 @@
 static char sccsid[] = "@(#)gethostnamadr.c    8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "Id: gethnamaddr.c,v 8.21 1997/06/01 20:34:37 vixie Exp ";
 #else
-__RCSID("$NetBSD: gethnamaddr.c,v 1.65 2005/06/01 04:39:36 lukem Exp $");
+__RCSID("$NetBSD: gethnamaddr.c,v 1.66 2005/09/15 15:25:40 tsarna Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -84,6 +84,7 @@
 #endif
 
 #define MULTI_PTRS_ARE_ALIASES 1       /* XXX - experimental */
+#define RESOLVSORT
 
 #include <nsswitch.h>
 #include <stdlib.h>
@@ -141,7 +142,7 @@
 static void map_v4v6_address(const char *, char *);
 static void map_v4v6_hostent(struct hostent *, char **, char *);
 #ifdef RESOLVSORT
-static void addrsort(char **, int, res_state *);
+static void addrsort(char **, int, res_state);
 #endif
 
 void _sethtent(int);