 @@ -1,14 +1,14 @@
-/*	$NetBSD: getnetnamadr.c,v 1.42 2012/03/13 21:13:41 christos Exp $	*/
+/*	$NetBSD: getnetnamadr.c,v 1.42.12.1 2015/11/08 00:35:21 riz Exp $	*/
 /* Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
  *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  */
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -33,27 +33,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)getnetbyaddr.c	8.1 (Berkeley) 6/4/93";
 static char sccsid_[] = "from getnetnamadr.c	1.4 (Coimbra) 93/06/03";
 static char rcsid[] = "Id: getnetnamadr.c,v 8.8 1997/06/01 20:34:37 vixie Exp ";
 #else
-__RCSID("$NetBSD: getnetnamadr.c,v 1.42 2012/03/13 21:13:41 christos Exp $");
+__RCSID("$NetBSD: getnetnamadr.c,v 1.42.12.1 2015/11/08 00:35:21 riz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include "namespace.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
 #include <assert.h>
 #include <ctype.h>
 @@ -67,26 +67,32 @@ __RCSID("$NetBSD: getnetnamadr.c,v 1.42
 #include <string.h>
 #ifdef YP
 #include <rpc/rpc.h>
 #include <rpcsvc/yp_prot.h>
 #include <rpcsvc/ypclnt.h>
 #endif
 #ifdef __weak_alias
 __weak_alias(getnetbyaddr,_getnetbyaddr)
 __weak_alias(getnetbyname,_getnetbyname)
 #endif
 #define maybe_ok(res, nm, ok) (((res)->options & RES_NOCHECKNAME) != 0U || \
                                (ok)(nm) != 0)
 #define maybe_hnok(res, hn) maybe_ok((res), (hn), res_hnok)
 #define maybe_dnok(res, dn) maybe_ok((res), (dn), res_dnok)
 extern int _net_stayopen;
 #define BYADDR 0
 #define BYNAME 1
 #define	MAXALIASES	35
 #define	MAXPACKET	(64*1024)
 typedef union {
 	HEADER	hdr;
 	u_char	buf[MAXPACKET];
 } querybuf;
 @@ -95,27 +101,27 @@ typedef union {
 	char	ac;
 } align;
 #ifdef YP
 static char *__ypdomain;
 static char *__ypcurrent;
 static int   __ypcurrentlen;
 #endif
 static	struct netent net_entry;
 static	char *net_aliases[MAXALIASES];
 static int		parse_reversed_addr(const char *, in_addr_t *);
-static struct netent	*getnetanswer(querybuf *, int, int);
+static struct netent	*getnetanswer(res_state, querybuf *, int, int);
 static int		_files_getnetbyaddr(void *, void *, va_list);
 static int		_files_getnetbyname(void *, void *, va_list);
 static int		_dns_getnetbyaddr(void *, void *, va_list);
 static int		_dns_getnetbyname(void *, void *, va_list);
 #ifdef YP
 static int		_yp_getnetbyaddr(void *, void *, va_list);
 static int		_yp_getnetbyname(void *, void *, va_list);
 static struct netent	*_ypnetent(char *);
 #endif
 /*
  * parse_reversed_addr --
  *	parse str, which should be of the form 'd.c.b.a.IN-ADDR.ARPA'
 @@ -149,39 +155,40 @@ parse_reversed_addr(const char *str, in_
 				/* ensure trailer is correct */
 	if (strcasecmp(sp, "IN-ADDR.ARPA") != 0)
 		return -1;
 	*result = 0;
 				/* build result from octets in reverse */
 	for (octidx = 3; octidx >= 0; octidx--) {
 		*result <<= 8;
 		*result |= (in_addr_t)(octet[octidx] & 0xff);
+	}
 	return 0;
+}
 static struct netent *
-getnetanswer(querybuf *answer, int anslen, int net_i)
+getnetanswer(res_state res, querybuf *answer, int anslen, int net_i)
+{
 	static char	n_name[MAXDNAME];
 	static char	netbuf[PACKETSZ];
 	HEADER		*hp;
 	u_char		*cp;
 	int		n;
 	u_char		*eom;
 	int		type, class, ancount, qdcount, haveanswer;
 	char		*in, *bp, **ap, *ep;
 	_DIAGASSERT(answer != NULL);
 	_DIAGASSERT(res != NULL);
 	/*
 	 * find first satisfactory answer
+	 *
 	 *      answer --> +------------+  ( MESSAGE )
 	 *		   |   Header   |
 	 *		   +------------+
 	 *		   |  Question  | the question for the name server
 	 *		   +------------+
 	 *		   |   Answer   | RRs answering the question
 	 *		   +------------+
 	 *		   | Authority  | RRs pointing toward an authority
 	 *		   | Additional | RRs holding additional information
 @@ -206,37 +213,37 @@ getnetanswer(querybuf *answer, int ansle
 		if (n < 0 || (cp + n + QFIXEDSZ) > eom) {
 			h_errno = NO_RECOVERY;
 			return(NULL);
+		}
 		cp += n + QFIXEDSZ;
+	}
 	ap = net_aliases;
 	*ap = NULL;
 	net_entry.n_aliases = net_aliases;
 	haveanswer = 0;
 	n_name[0] = '\0';
 	while (--ancount >= 0 && cp < eom) {
 		n = dn_expand(answer->buf, eom, cp, bp, (int)(ep - bp));
-		if ((n < 0) || !res_dnok(bp))
+		if ((n < 0) || !maybe_dnok(res, bp))
 			break;
 		cp += n;
 		(void)strlcpy(n_name, bp, sizeof(n_name));
 		GETSHORT(type, cp);
 		GETSHORT(class, cp);
 		cp += INT32SZ;		/* TTL */
 		GETSHORT(n, cp);
 		if (class == C_IN && type == T_PTR) {
 			n = dn_expand(answer->buf, eom, cp, bp, (int)(ep - bp));
-			if ((n < 0) || !res_hnok(bp)) {
+			if ((n < 0) || !maybe_hnok(res, bp)) {
 				cp += n;
 				return NULL;
+			}
 			cp += n;
 			*ap++ = bp;
 			bp += strlen(bp) + 1;
 			net_entry.n_addrtype =
 				(class == C_IN) ? AF_INET : AF_UNSPEC;
 			haveanswer++;
+		}
+	}
 	if (haveanswer) {
 		*ap = NULL;
 @@ -348,28 +355,28 @@ _dns_getnetbyaddr(void *cbrv, void *cbda
 		return NS_NOTFOUND;
+	}
 	anslen = res_nquery(res, qbuf, C_IN, T_PTR, buf->buf,
 	    (int)sizeof(buf->buf));
 	if (anslen < 0) {
 		free(buf);
 #ifdef DEBUG
 		if (res->options & RES_DEBUG)
 			printf("res_query failed\n");
 #endif
 		__res_put_state(res);
 		return NS_NOTFOUND;
+	}
 	np = getnetanswer(res, buf, anslen, BYADDR);
 	__res_put_state(res);
 	np = getnetanswer(buf, anslen, BYADDR);
 	free(buf);
 	if (np) {
 		/* maybe net should be unsigned? */
 		uint32_t u_net = net;
 		/* Strip trailing zeros */
 		while ((u_net & 0xff) == 0 && u_net != 0)
 			u_net >>= 8;
 		np->n_net = u_net;
+	}
 	if (np != NULL) {
 		*retval = np;
 @@ -460,28 +467,28 @@ _dns_getnetbyname(void *cbrv, void *cbda
 		return NS_NOTFOUND;
+	}
 	anslen = res_nsearch(res, qbuf, C_IN, T_PTR, buf->buf,
 	    (int)sizeof(buf->buf));
 	if (anslen < 0) {
 		free(buf);
 #ifdef DEBUG
 		if (res->options & RES_DEBUG)
 			printf("res_search failed\n");
 #endif
 		__res_put_state(res);
 		return NS_NOTFOUND;
+	}
 	np = getnetanswer(res, buf, anslen, BYNAME);
 	__res_put_state(res);
 	np = getnetanswer(buf, anslen, BYNAME);
 	free(buf);
 	if (np != NULL) {
 		*retval = np;
 		return NS_SUCCESS;
 	} else {
 		h_errno = HOST_NOT_FOUND;
 		return NS_NOTFOUND;
+	}
+}
 struct netent *
 getnetbyname(const char *name)

	@@ -139,33 +139,40 @@ prompt (void)		@@ -139,33 +139,40 @@ prompt (void)
139	}	139	}
140		140
141	void	141	void
142	maybequit (void)	142	maybequit (void)
143	{	143	{
144	if (! interactive)	144	if (! interactive)
145	xexit (9);	145	xexit (9);
146	}	146	}
147		147
148		148
149	void	149	void
150	ar_open (char *name, int t)	150	ar_open (char *name, int t)
151	{	151	{
152	char tname = (char ) xmalloc (strlen (name) + 10);	152	char *tname;
153	const char *bname = lbasename (name);	153	const char *bname = lbasename (name);
154	real_name = name;	154	real_name = name;
155		155
156	/* Prepend tmp- to the beginning, to avoid file-name clashes after	156	/* Prepend tmp- to the beginning, to avoid file-name clashes after
157	truncation on filesystems with limited namespaces (DOS). */	157	truncation on filesystems with limited namespaces (DOS). */
158	sprintf (tname, "%.*stmp-%s", (int) (bname - name), name, bname);	158	if (asprintf (&tname, "%.*stmp-%s", (int) (bname - name), name, bname) == -1)
		159	{
		160	fprintf (stderr, _("%s: Can't allocate memory for temp name (%s)\n"),
		161	program_name, strerror(errno));
		162	maybequit ();
		163	return;
		164	}
		165
159	obfd = bfd_openw (tname, NULL);	166	obfd = bfd_openw (tname, NULL);
160		167
161	if (!obfd)	168	if (!obfd)
162	{	169	{
163	fprintf (stderr,	170	fprintf (stderr,
164	_("%s: Can't open output archive %s\n"),	171	_("%s: Can't open output archive %s\n"),
165	program_name, tname);	172	program_name, tname);
166		173
167	maybequit ();	174	maybequit ();
168	}	175	}
169	else	176	else
170	{	177	{
171	if (!t)	178	if (!t)