 @@ -1,14 +1,14 @@
-/*	$NetBSD: getnameinfo.c,v 1.56 2015/05/15 14:26:02 joerg Exp $	*/
+/*	$NetBSD: getnameinfo.c,v 1.57 2015/09/03 15:01:19 christos Exp $	*/
 /*	$KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $	*/
 /*
  * Copyright (c) 2000 Ben Harris.
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -37,27 +37,27 @@
  * - RFC2553 says that we should raise error on short buffer.  X/Open says
  *   we need to truncate the result.  We obey RFC2553 (and X/Open should be
  *   modified).  ipngwg rough consensus seems to follow RFC2553.
  * - What is "local" in NI_FQDN?
  * - NI_NAMEREQD and NI_NUMERICHOST conflict with each other.
  * - (KAME extension) always attach textual scopeid (fe80::1%lo0), if
  *   sin6_scope_id is filled - standardization status?
  *   XXX breaks backward compat for code that expects no scopeid.
  *   beware on merge.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getnameinfo.c,v 1.56 2015/05/15 14:26:02 joerg Exp $");
+__RCSID("$NetBSD: getnameinfo.c,v 1.57 2015/09/03 15:01:19 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 #ifndef RUMP_ACTION
 #include "namespace.h"
 #endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_ieee1394.h>
 #include <net/if_types.h>
 #include <netatalk/at.h>
 @@ -526,48 +526,40 @@ getnameinfo_link(const struct sockaddr *
     char *host, socklen_t hostlen, char *serv, socklen_t servlen,
     int flags)
+{
 	const struct sockaddr_dl *sdl =
 	    (const struct sockaddr_dl *)(const void *)sa;
 	const struct ieee1394_hwaddr *iha;
 	int n;
 	if (serv != NULL && servlen > 0)
 		*serv = '\0';
 	if (sdl->sdl_nlen == 0 && sdl->sdl_alen == 0 && sdl->sdl_slen == 0) {
 		n = snprintf(host, hostlen, "link#%u", sdl->sdl_index);
-		if (n < 0 || (socklen_t) n > hostlen) {
+		goto out;
 			*host = '\0';
 			return EAI_MEMORY;
 		return 0;
+	}
 	switch (sdl->sdl_type) {
 #ifdef IFT_ECONET
 	case IFT_ECONET:
 		if (sdl->sdl_alen < 2)
 			return EAI_FAMILY;
 		if (CLLADDR(sdl)[1] == 0)
 			n = snprintf(host, hostlen, "%u", CLLADDR(sdl)[0]);
 		else
 			n = snprintf(host, hostlen, "%u.%u",
 			    CLLADDR(sdl)[1], CLLADDR(sdl)[0]);
-		if (n < 0 || (socklen_t) n >= hostlen) {
+		goto out;
 			*host = '\0';
 			return EAI_MEMORY;
 		} else
 			return 0;
 #endif
 	case IFT_IEEE1394:
 		if (sdl->sdl_alen < sizeof(iha->iha_uid))
 			return EAI_FAMILY;
 		iha =
 		    (const struct ieee1394_hwaddr *)(const void *)CLLADDR(sdl);
 		return hexname(iha->iha_uid, sizeof(iha->iha_uid),
 		    host, hostlen);
 	/*
 	 * The following have zero-length addresses.
 	 * IFT_ATM	(net/if_atmsubr.c)
 	 * IFT_FAITH	(net/if_faith.c)
 	 * IFT_GIF	(net/if_gif.c)
 @@ -581,26 +573,32 @@ getnameinfo_link(const struct sockaddr *
 	/*
 	 * The following use IPv4 addresses as link-layer addresses:
 	 * IFT_OTHER	(net/if_gre.c)
 	 */
 	case IFT_ARCNET: /* default below is believed correct for all these. */
 	case IFT_ETHER:
 	case IFT_FDDI:
 	case IFT_HIPPI:
 	case IFT_ISO88025:
 	default:
 		return hexname((const uint8_t *)CLLADDR(sdl),
 		    (size_t)sdl->sdl_alen, host, hostlen);
+	}
 out:
 	if (n < 0 || (socklen_t) n >= hostlen) {
 		*host = '\0';
 		return EAI_MEMORY;
+	}
 	return 0;
+}
 static int
 hexname(const uint8_t *cp, size_t len, char *host, socklen_t hostlen)
+{
 	int n;
 	size_t i;
 	char *outp = host;
 	*outp = '\0';
 	for (i = 0; i < len; i++) {
 		n = snprintf(outp, hostlen, "%s%02x",
 		    i ? ":" : "", cp[i]);