Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/lib/libc/resolv/res_init.c,v
rcsdiff: /ftp/cvs/cvsroot/src/lib/libc/resolv/res_init.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- src/lib/libc/resolv/res_init.c	2004/05/21 16:03:05	1.5
+++ src/lib/libc/resolv/res_init.c	2005/09/15 23:33:41	1.6
@@ -1,4 +1,4 @@
-/*	$NetBSD: res_init.c,v 1.5 2004/05/21 16:03:05 christos Exp $	*/
+/*	$NetBSD: res_init.c,v 1.6 2005/09/15 23:33:41 tsarna Exp $	*/
 
 /*
  * Copyright (c) 1985, 1989, 1993
@@ -76,7 +76,7 @@
 static const char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
 static const char rcsid[] = "Id: res_init.c,v 1.9.2.5.4.2 2004/03/16 12:34:18 marka Exp";
 #else
-__RCSID("$NetBSD: res_init.c,v 1.5 2004/05/21 16:03:05 christos Exp $");
+__RCSID("$NetBSD: res_init.c,v 1.6 2005/09/15 23:33:41 tsarna Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -121,16 +121,13 @@ __weak_alias(res_setservers,__res_setser
 #include "res_private.h"
 
 /* Options.  Should all be left alone. */
-#define RESOLVSORT
 #define DEBUG
 
 static void res_setoptions __P((res_state, const char *, const char *));
 
-#ifdef RESOLVSORT
 static const char sort_mask[] = "/&";
 #define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
 static u_int32_t net_mask __P((struct in_addr));
-#endif
 
 #if !defined(isascii)	/* XXX - could be a function */
 # define isascii(c) (!(c & 0200))
@@ -178,10 +175,8 @@ __res_vinit(res_state statp, int preinit
 	int nserv = 0;    /* number of nameserver records read from file */
 	int haveenv = 0;
 	int havesearch = 0;
-#ifdef RESOLVSORT
 	int nsort = 0;
 	char *net;
-#endif
 	int dots;
 	union res_sockaddr_union u[2];
 
@@ -235,9 +230,7 @@ __res_vinit(res_state statp, int preinit
 		strcpy(statp->_u._ext.ext->nsuffix, "ip6.arpa");
 		strcpy(statp->_u._ext.ext->nsuffix2, "ip6.int");
 	}
-#ifdef RESOLVSORT
 	statp->nsort = 0;
-#endif
 	res_setservers(statp, u, nserv);
 
 	/* Allow user to override the local domain definition */
@@ -375,7 +368,6 @@ __res_vinit(res_state statp, int preinit
 		    }
 		    continue;
 		}
-#ifdef RESOLVSORT
 		if (MATCH(buf, "sortlist")) {
 		    struct in_addr a;
 
@@ -418,7 +410,6 @@ __res_vinit(res_state statp, int preinit
 		    }
 		    continue;
 		}
-#endif
 		if (MATCH(buf, "options")) {
 		    res_setoptions(statp, buf + sizeof("options") - 1, "conf");
 		    continue;
@@ -426,9 +417,7 @@ __res_vinit(res_state statp, int preinit
 	    }
 	    if (nserv > 0) 
 		statp->nscount = nserv;
-#ifdef RESOLVSORT
 	    statp->nsort = nsort;
-#endif
 	    (void) fclose(fp);
 	}
 /*
@@ -593,7 +582,6 @@ res_setoptions(res_state statp, const ch
 	}
 }
 
-#ifdef RESOLVSORT
 /* XXX - should really support CIDR which means explicit masks always. */
 static u_int32_t
 net_mask(in)		/* XXX - should really use system's version of this */
@@ -607,7 +595,6 @@ net_mask(in)		/* XXX - should really use
 		return (htonl(IN_CLASSB_NET));
 	return (htonl(IN_CLASSC_NET));
 }
-#endif
 
 u_int
 res_randomid(void) {