diff --git a/usr.sbin/map-mbone/mapper.c b/usr.sbin/map-mbone/mapper.c
index 8a4663d644f4..efa45b6ef75d 100644
--- a/usr.sbin/map-mbone/mapper.c
+++ b/usr.sbin/map-mbone/mapper.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mapper.c,v 1.8 2001/09/24 13:22:37 wiz Exp $	*/
+/*	$NetBSD: mapper.c,v 1.9 2002/06/02 13:47:02 itojun Exp $	*/
 
 /* Mapper for connections between MRouteD multicast routers.
  * Written by Pavel Curtis <Pavel@PARC.Xerox.Com>
@@ -921,6 +921,7 @@ int main(argc, argv)
 	struct sockaddr_in addr;
 	int addrlen = sizeof(addr);
 
+	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;
 #if (defined(BSD) && (BSD >= 199103))
 	addr.sin_len = sizeof addr;
diff --git a/usr.sbin/mrinfo/mrinfo.c b/usr.sbin/mrinfo/mrinfo.c
index dce82ab8e4dd..5ba6558a3caa 100644
--- a/usr.sbin/mrinfo/mrinfo.c
+++ b/usr.sbin/mrinfo/mrinfo.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mrinfo.c,v 1.12 2001/09/24 13:22:37 wiz Exp $	*/
+/*	$NetBSD: mrinfo.c,v 1.13 2002/06/02 13:47:02 itojun Exp $	*/
 
 /*
  * This tool requests configuration info from a multicast router
@@ -80,7 +80,7 @@
 static char rcsid[] =
     "@(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp (LBL)";
 #else
-__RCSID("$NetBSD: mrinfo.c,v 1.12 2001/09/24 13:22:37 wiz Exp $");
+__RCSID("$NetBSD: mrinfo.c,v 1.13 2002/06/02 13:47:02 itojun Exp $");
 #endif
 #endif
 
@@ -414,6 +414,7 @@ main(argc, argv)
 		struct sockaddr_in addr;
 		int     addrlen = sizeof(addr);
 
+		memset(&addr, 0, sizeof(addr));
 		addr.sin_family = AF_INET;
 #if (defined(BSD) && (BSD >= 199103))
 		addr.sin_len = sizeof addr;
diff --git a/usr.sbin/mrouted/snmp.c b/usr.sbin/mrouted/snmp.c
index dbbaf985f8a0..1b6b3dfbc508 100644
--- a/usr.sbin/mrouted/snmp.c
+++ b/usr.sbin/mrouted/snmp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: snmp.c,v 1.4 1999/01/23 22:44:43 hwr Exp $	*/
+/*	$NetBSD: snmp.c,v 1.5 2002/06/02 13:47:03 itojun Exp $	*/
 
 #include "defs.h"
 #include <netinet/in_var.h>
@@ -90,6 +90,7 @@ snmp_init(dest_port)
        perror("socket");
        return 1;
    }
+   memset(&me, 0, sizeof(me));
    me.sin_family = AF_INET;
    me.sin_addr.s_addr = INADDR_ANY;
    /* already in network byte order (I think) */
diff --git a/usr.sbin/mrouted/vif.c b/usr.sbin/mrouted/vif.c
index 88f10c5ff79e..59a7761c9582 100644
--- a/usr.sbin/mrouted/vif.c
+++ b/usr.sbin/mrouted/vif.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vif.c,v 1.8 2000/10/12 06:07:04 augustss Exp $	*/
+/*	$NetBSD: vif.c,v 1.9 2002/06/02 13:47:04 itojun Exp $	*/
 
 /*
  * The mrouted program is covered by the license in the accompanying file
@@ -713,6 +713,7 @@ accept_neighbor_request(src, dst)
 	struct sockaddr_in addr;
 	int addrlen = sizeof(addr);
 
+	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;
 #if (defined(BSD) && (BSD >= 199103))
 	addr.sin_len = sizeof addr;
@@ -800,6 +801,7 @@ accept_neighbor_request2(src, dst)
 	struct sockaddr_in addr;
 	int addrlen = sizeof(addr);
 
+	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;
 #if (defined(BSD) && (BSD >= 199103))
 	addr.sin_len = sizeof addr;
diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c
index a6d7da86ee60..8a6d4adbb3aa 100644
--- a/usr.sbin/mtrace/mtrace.c
+++ b/usr.sbin/mtrace/mtrace.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mtrace.c,v 1.18 2001/09/24 13:22:37 wiz Exp $	*/
+/*	$NetBSD: mtrace.c,v 1.19 2002/06/02 13:47:04 itojun Exp $	*/
 
 /*
  * mtrace.c
@@ -52,7 +52,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mtrace.c,v 1.18 2001/09/24 13:22:37 wiz Exp $");
+__RCSID("$NetBSD: mtrace.c,v 1.19 2002/06/02 13:47:04 itojun Exp $");
 #endif
 
 #include <sys/types.h>
@@ -1345,6 +1345,7 @@ Usage: mtrace [-Mlnps] [-w wait] [-m max_hops] [-q nqueries] [-g gateway]\n\
     /*
      * Get default local address for multicasts to use in setting defaults.
      */
+    memset(&addr, 0, sizeof(addr));
     addr.sin_family = AF_INET;
 #if (defined(BSD) && (BSD >= 199103))
     addr.sin_len = sizeof(addr);