From 59d51fc4e5bcdda4da0d50ab90fda7f77068b4db Mon Sep 17 00:00:00 2001
From: suz <suz@FreeBSD.org>
Date: Sat, 5 Nov 2005 10:56:06 +0000
Subject: [PATCH] MFC: sync with KAME in the following points:   - removed
 compilation warnings   - suppress a redundant error message when a
 default-router-list is empty

  Revision  Changes    Path
  1.18      +4 -1      src/usr.sbin/ndp/ndp.c
---
 usr.sbin/ndp/ndp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index 5068ce9a761a..33e1a6a9b718 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -142,7 +142,6 @@ void ifinfo __P((char *, int, char **));
 void rtrlist __P((void));
 void plist __P((void));
 void pfx_flush __P((void));
-void rtrlist __P((void));
 void rtr_flush __P((void));
 void harmonize_rtr __P((void));
 #ifdef SIOCSDEFIFACE_IN6	/* XXX: check SIOCGDEFIFACE_IN6 as well? */
@@ -1047,6 +1046,8 @@ ifinfo(ifname, argc, argv)
 				printf("\nRandom ID:      ");
 				rbuf = ND.randomid;
 				break;
+			default:
+				errx(1, "impossible case for tempaddr display");
 			}
 			for (j = 0; j < 8; j++)
 				printf("%02x", rbuf[j]);
@@ -1094,6 +1095,8 @@ rtrlist()
 		err(1, "sysctl(ICMPV6CTL_ND6_DRLIST)");
 		/*NOTREACHED*/
 	}
+	if (l == 0)
+		return;
 	buf = malloc(l);
 	if (!buf) {
 		err(1, "malloc");