Merge sync of head

4 files changed, 7 insertions, 5 deletions

diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index 8f2a819..2308722 100644
--- a/sbin/routed/Makefile
+++ b/sbin/routed/Makefile
@@ -5,8 +5,7 @@ PROG=	routed
 MAN=	routed.8
 SRCS=	if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c
 WARNS?=	3
-DPADD=	${LIBMD}
-LDADD=	-lmd
+LIBADD=	md
 
 SUBDIR= rtquery
 
diff --git a/sbin/routed/input.c b/sbin/routed/input.c
index 901c4f3..895ef50 100644
--- a/sbin/routed/input.c
+++ b/sbin/routed/input.c
@@ -288,6 +288,10 @@ input(struct sockaddr_in *from,		/* received from this IP address */
 				/* Answer a query from a utility program
 				 * with all we know.
 				 */
+				if (aifp == NULL) {
+					trace_pkt("ignore remote query");
+					return;
+				}
 				if (from->sin_port != htons(RIP_PORT)) {
 					/*
 					 * insecure: query from non-router node
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index ca5250b..68d3f96 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -254,7 +254,7 @@ The following options are available:
 allow
 .Nm
 to accept a RIP request from non-router node.
-When specified once, 
+When specified once,
 .Nm
 replies to a route information query from neighbor nodes.
 When specified twice,
diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index e5d0f5a..4df7dc2 100644
--- a/sbin/routed/rtquery/Makefile
+++ b/sbin/routed/rtquery/Makefile
@@ -4,8 +4,7 @@
 
 PROG=	rtquery
 MAN=	rtquery.8
-LDADD=	-lmd
-DPADD=	${LIBMD}
+LIBADD=	md
 WARNS?=	3
 NO_WARRAY_BOUNDS=