Sync with recent KAME.

This work was based on kame-20010528-freebsd43-snap.tgz and some
critical problem after the snap was out were fixed.
There are many many changes since last KAME merge.

TODO:
  - The definitions of SADB_* in sys/net/pfkeyv2.h are still different
    from RFC2407/IANA assignment because of binary compatibility
    issue.  It should be fixed under 5-CURRENT.
  - ip6po_m member of struct ip6_pktopts is no longer used.  But, it
    is still there because of binary compatibility issue.  It should
    be removed under 5-CURRENT.

Reviewed by:	itojun
Obtained from:	KAME
MFC after:	3 weeks

1 files changed, 6 insertions, 0 deletions

diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c
index e26db45..68cad62 100644
--- a/usr.sbin/ifmcstat/ifmcstat.c
+++ b/usr.sbin/ifmcstat/ifmcstat.c
@@ -39,6 +39,8 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/queue.h>
+
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_types.h>
@@ -234,6 +236,10 @@ if6_addrlist(ifap)
 		KREAD(ifap0, &ifa, struct ifaddr);
 
 		nam = strdup(ifname(ifa.ifa_ifp));
+		if (!nam) {
+			fprintf(stderr, "ifmcstat: not enough core\n");
+			exit(1);
+		}
 
 		LIST_FOREACH(mkp, &in6_mk, mk_entry) {
 			KREAD(mkp, &mk, struct multi6_kludge);