Replace log() with logit() since ISO C reserves log() for the math

library and gcc 3.x will complain.  Replacement name taken from NetBSD.
espie@ OK.

14 files changed, 228 insertions, 228 deletions

diff --git a/usr.sbin/map-mbone/mapper.c b/usr.sbin/map-mbone/mapper.c
index 325db38fa71..4135b58d96a 100644
--- a/usr.sbin/map-mbone/mapper.c
+++ b/usr.sbin/map-mbone/mapper.c
@@ -169,7 +169,7 @@ Neighbor *find_neighbor(addr, node)
  * worse, terminate the program.
  */
 void
-log(int severity, int syserr, char *format, ...)
+logit(int severity, int syserr, char *format, ...)
 {
     va_list ap;
     char    fmt[100];
@@ -224,7 +224,7 @@ void accept_group_report(src, dst, group, r_type)
     u_int32_t src, dst, group;
     int r_type;
 {
-    log(LOG_INFO, 0, "ignoring IGMP group membership report from %s to %s",
+    logit(LOG_INFO, 0, "ignoring IGMP group membership report from %s to %s",
 	inet_fmt(src, s1), inet_fmt(dst, s2));
 }
 
@@ -237,7 +237,7 @@ void accept_probe(src, dst, p, datalen, level)
     char *p;
     int datalen;
 {
-    log(LOG_INFO, 0, "ignoring DVMRP probe from %s to %s",
+    logit(LOG_INFO, 0, "ignoring DVMRP probe from %s to %s",
 	inet_fmt(src, s1), inet_fmt(dst, s2));
 }
 
@@ -250,7 +250,7 @@ void accept_report(src, dst, p, datalen, level)
     char *p;
     int datalen;
 {
-    log(LOG_INFO, 0, "ignoring DVMRP routing report from %s to %s",
+    logit(LOG_INFO, 0, "ignoring DVMRP routing report from %s to %s",
 	inet_fmt(src, s1), inet_fmt(dst, s2));
 }
 
@@ -262,7 +262,7 @@ void accept_neighbor_request(src, dst)
     u_int32_t src, dst;
 {
     if (src != our_addr)
-	log(LOG_INFO, 0,
+	logit(LOG_INFO, 0,
 	    "ignoring spurious DVMRP neighbor request from %s to %s",
 	    inet_fmt(src, s1), inet_fmt(dst, s2));
 }
@@ -271,7 +271,7 @@ void accept_neighbor_request2(src, dst)
     u_int32_t src, dst;
 {
     if (src != our_addr)
-	log(LOG_INFO, 0,
+	logit(LOG_INFO, 0,
 	    "ignoring spurious DVMRP neighbor request2 from %s to %s",
 	    inet_fmt(src, s1), inet_fmt(dst, s2));
 }
@@ -326,7 +326,7 @@ void accept_neighbors(src, dst, p, datalen, level)
 	Neighbor       *old_neighbors;
 
 	if (datalen < 4 + 3) {
-	    log(LOG_WARNING, 0, "received truncated interface record from %s",
+	    logit(LOG_WARNING, 0, "received truncated interface record from %s",
 		inet_fmt(src, s1));
 	    return;
 	}
@@ -371,7 +371,7 @@ void accept_neighbors(src, dst, p, datalen, level)
 			if (nb_i->addr == nb_n->addr) {
 			    if (nb_i->metric != nb_n->metric
 				|| nb_i->threshold != nb_n->threshold)
-				log(LOG_WARNING, 0,
+				logit(LOG_WARNING, 0,
 				    "inconsistent %s for neighbor %s of %s",
 				    "metric/threshold",
 				    inet_fmt(nb_i->addr, s1),
@@ -403,7 +403,7 @@ void accept_neighbors(src, dst, p, datalen, level)
 	    Node       *n_node;
 
 	    if (datalen < 4) {
-		log(LOG_WARNING, 0, "received truncated neighbor list from %s",
+		logit(LOG_WARNING, 0, "received truncated neighbor list from %s",
 		    inet_fmt(src, s1));
 		return;
 	    }
@@ -415,7 +415,7 @@ void accept_neighbors(src, dst, p, datalen, level)
 	    for (nb = old_neighbors; nb; nb = nb->next)
 		if (nb->addr == neighbor) {
 		    if (metric != nb->metric || threshold != nb->threshold)
-			log(LOG_WARNING, 0,
+			logit(LOG_WARNING, 0,
 			    "inconsistent %s for neighbor %s of %s",
 			    "metric/threshold",
 			    inet_fmt(nb->addr, s1), inet_fmt(node->addr, s2));
@@ -463,7 +463,7 @@ void accept_neighbors2(src, dst, p, datalen, level)
 	Neighbor       *old_neighbors;
 
 	if (datalen < 4 + 4) {
-	    log(LOG_WARNING, 0, "received truncated interface record from %s",
+	    logit(LOG_WARNING, 0, "received truncated interface record from %s",
 		inet_fmt(src, s1));
 	    return;
 	}
@@ -514,7 +514,7 @@ void accept_neighbors2(src, dst, p, datalen, level)
 			if (nb_i->addr == nb_n->addr) {
 			    if (nb_i->metric != nb_n->metric
 				|| nb_i->threshold != nb_i->threshold)
-				log(LOG_WARNING, 0,
+				logit(LOG_WARNING, 0,
 				    "inconsistent %s for neighbor %s of %s",
 				    "metric/threshold",
 				    inet_fmt(nb_i->addr, s1),
@@ -546,7 +546,7 @@ void accept_neighbors2(src, dst, p, datalen, level)
 	    Node       *n_node;
 
 	    if (datalen < 4) {
-		log(LOG_WARNING, 0, "received truncated neighbor list from %s",
+		logit(LOG_WARNING, 0, "received truncated neighbor list from %s",
 		    inet_fmt(src, s1));
 		return;
 	    }
@@ -561,7 +561,7 @@ void accept_neighbors2(src, dst, p, datalen, level)
 	    for (nb = old_neighbors; nb; nb = nb->next)
 		if (nb->addr == neighbor) {
 		    if (metric != nb->metric || threshold != nb->threshold)
-			log(LOG_WARNING, 0,
+			logit(LOG_WARNING, 0,
 			    "inconsistent %s for neighbor %s of %s",
 			    "metric/threshold",
 			    inet_fmt(nb->addr, s1), inet_fmt(node->addr, s2));
@@ -590,7 +590,7 @@ void accept_neighbors2(src, dst, p, datalen, level)
 
 void check_vif_state()
 {
-    log(LOG_NOTICE, 0, "network marked down...");
+    logit(LOG_NOTICE, 0, "network marked down...");
 }
 
 
@@ -948,7 +948,7 @@ int main(argc, argv)
 		perror("select");
 	    continue;
 	} else if (count == 0) {
-	    log(LOG_DEBUG, 0, "Timed out receiving neighbor lists");
+	    logit(LOG_DEBUG, 0, "Timed out receiving neighbor lists");
 	    if (retry_requests(routers))
 		continue;
 	    else
diff --git a/usr.sbin/mrinfo/mrinfo.c b/usr.sbin/mrinfo/mrinfo.c
index b528415b637..895a933cf5a 100644
--- a/usr.sbin/mrinfo/mrinfo.c
+++ b/usr.sbin/mrinfo/mrinfo.c
@@ -76,7 +76,7 @@
 
 #ifndef lint
 static char rcsid[] =
-    "@(#) $OpenBSD: mrinfo.c,v 1.17 2003/08/19 19:09:45 deraadt Exp $";
+    "@(#) $OpenBSD: mrinfo.c,v 1.18 2003/11/26 01:17:12 millert Exp $";
 /*  original rcsid:
     "@(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp (LBL)";
 */
@@ -133,7 +133,7 @@ inet_name(u_int32_t addr)
  * worse, terminate the program.
  */
 void
-log(int severity, int syserr, char *format, ...)
+logit(int severity, int syserr, char *format, ...)
 {
 	va_list ap;
 
@@ -443,7 +443,7 @@ main(int argc, char *argv[])
 					perror("select");
 				continue;
 			} else if (count == 0) {
-				log(LOG_DEBUG, 0,
+				logit(LOG_DEBUG, 0,
 				    "Timed out receiving neighbor lists");
 				if (++tries > retries)
 					break;
@@ -469,7 +469,7 @@ main(int argc, char *argv[])
 			}
 
 			if (recvlen < sizeof(struct ip)) {
-				log(LOG_WARNING, 0,
+				logit(LOG_WARNING, 0,
 				    "packet too short (%u bytes) for IP header",
 				    recvlen);
 				continue;
@@ -482,7 +482,7 @@ main(int argc, char *argv[])
 			iphdrlen = ip->ip_hl << 2;
 			ipdatalen = ntohs(ip->ip_len);
 			if (iphdrlen + ipdatalen != recvlen) {
-				log(LOG_WARNING, 0,
+				logit(LOG_WARNING, 0,
 				    "packet shorter (%u bytes) than "
 				    "hdr+data length (%u+%u)",
 				    recvlen, iphdrlen, ipdatalen);
@@ -492,7 +492,7 @@ main(int argc, char *argv[])
 			group = igmp->igmp_group.s_addr;
 			igmpdatalen = ipdatalen - IGMP_MINLEN;
 			if (igmpdatalen < 0) {
-				log(LOG_WARNING, 0,
+				logit(LOG_WARNING, 0,
 				    "IP data field too short (%u bytes) "
 				    "for IGMP, from %s",
 				    ipdatalen, inet_fmt(src, s1));
diff --git a/usr.sbin/mrouted/callout.c b/usr.sbin/mrouted/callout.c
index bbb9b4595ad..d3c24357675 100644
--- a/usr.sbin/mrouted/callout.c
+++ b/usr.sbin/mrouted/callout.c
@@ -68,7 +68,7 @@ age_callout_queue(void)
 	else {
 	    ptr->time --;
 #ifdef IGMP_DEBUG
-	    log(LOG_DEBUG,0,"[callout, age_callout_queue] -- time (%d)", ptr->time);
+	    logit(LOG_DEBUG,0,"[callout, age_callout_queue] -- time (%d)", ptr->time);
 #endif /* IGMP_DEBUG */
 	    in_callout = 0; return;
 	}
@@ -97,7 +97,7 @@ timer_setTimer(int delay, cfunc_t action, char *data)
     /* create a node */
     node = (struct timeout_q *)malloc(sizeof(struct timeout_q));
     if (node == 0) {
-	log(LOG_WARNING, 0, "Malloc Failed in timer_settimer\n");
+	logit(LOG_WARNING, 0, "Malloc Failed in timer_settimer\n");
 	in_callout = 0;
 	return -1;
     }
@@ -204,7 +204,7 @@ print_Q(void)
     struct timeout_q  *ptr;
 
     for(ptr = Q; ptr; ptr = ptr->next)
-	log(LOG_DEBUG,0,"(%d,%d) ", ptr->id, ptr->time);
+	logit(LOG_DEBUG,0,"(%d,%d) ", ptr->id, ptr->time);
 }
 #endif /* IGMP_DEBUG */
 
diff --git a/usr.sbin/mrouted/cfparse.y b/usr.sbin/mrouted/cfparse.y
index 8f34d05eae8..f60c28bd000 100644
--- a/usr.sbin/mrouted/cfparse.y
+++ b/usr.sbin/mrouted/cfparse.y
@@ -188,7 +188,7 @@ stmt	: error
 					}
 		tunnelmods
 					{
-			log(LOG_INFO, 0,
+			logit(LOG_INFO, 0,
 			    "installing tunnel from %s to %s as vif #%u - rate=%d",
 			    inet_fmt($2, s1), inet_fmt($3, s2),
 			    numvifs, v->uv_rate_limit);
@@ -398,7 +398,7 @@ fatal(char *fmt, ...)
 	vsnprintf(buf, sizeof buf, fmt, ap);
 	va_end(ap);
 
-	log(LOG_ERR,0,"%s: %s near line %d", configfilename, buf, lineno);
+	logit(LOG_ERR,0,"%s: %s near line %d", configfilename, buf, lineno);
 }
 
 static void
@@ -411,14 +411,14 @@ warn(char *fmt, ...)
 	vsnprintf(buf, sizeof buf, fmt, ap);
 	va_end(ap);
 
-	log(LOG_WARNING,0,"%s: %s near line %d", configfilename, buf, lineno);
+	logit(LOG_WARNING,0,"%s: %s near line %d", configfilename, buf, lineno);
 }
 
 static void
 yyerror(s)
 char *s;
 {
-	log(LOG_ERR, 0, "%s: %s near line %d", configfilename, s, lineno);
+	logit(LOG_ERR, 0, "%s: %s near line %d", configfilename, s, lineno);
 }
 
 static char *
@@ -566,7 +566,7 @@ config_vifs_from_file()
 
 	if ((f = fopen(configfilename, "r")) == NULL) {
 	    if (errno != ENOENT)
-		log(LOG_ERR, errno, "can't open %s", configfilename);
+		logit(LOG_ERR, errno, "can't open %s", configfilename);
 	    return;
 	}
 
diff --git a/usr.sbin/mrouted/config.c b/usr.sbin/mrouted/config.c
index 64a4c6b0b22..20f193fd761 100644
--- a/usr.sbin/mrouted/config.c
+++ b/usr.sbin/mrouted/config.c
@@ -28,7 +28,7 @@ config_vifs_from_kernel(void)
     short flags;
 
     if (getifaddrs(&ifap) < 0)
-	log(LOG_ERR, errno, "getifaddrs");
+	logit(LOG_ERR, errno, "getifaddrs");
 
     for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
 	/*
@@ -57,7 +57,7 @@ config_vifs_from_kernel(void)
 	if (!inet_valid_subnet(subnet, mask) ||
 	    addr == subnet ||
 	    addr == (subnet | ~mask)) {
-	    log(LOG_WARNING, 0,
+	    logit(LOG_WARNING, 0,
 		"ignoring %s, has invalid address (%s) and/or mask (%s)",
 		ifa->ifa_name, inet_fmt(addr, s1), inet_fmt(mask, s2));
 	    continue;
@@ -70,7 +70,7 @@ config_vifs_from_kernel(void)
 	for (vifi = 0, v = uvifs; vifi < numvifs; ++vifi, ++v) {
 	    if ((addr & v->uv_subnetmask) == v->uv_subnet ||
 		(v->uv_subnet & mask) == subnet) {
-		log(LOG_WARNING, 0, "ignoring %s, same subnet as %s",
+		logit(LOG_WARNING, 0, "ignoring %s, same subnet as %s",
 		    ifa->ifa_name, v->uv_name);
 		break;
 	    }
@@ -82,7 +82,7 @@ config_vifs_from_kernel(void)
 	 * If there is room in the uvifs array, install this interface.
 	 */
 	if (numvifs == MAXVIFS) {
-	    log(LOG_WARNING, 0, "too many vifs, ignoring %s", ifa->ifa_name);
+	    logit(LOG_WARNING, 0, "too many vifs, ignoring %s", ifa->ifa_name);
 	    continue;
 	}
 	v  = &uvifs[numvifs];
@@ -101,7 +101,7 @@ config_vifs_from_kernel(void)
 	v->uv_acl         = NULL;
 	v->uv_addrs	  = NULL;
 
-	log(LOG_INFO,0,"installing %s (%s on subnet %s) as vif #%u - rate=%d",
+	logit(LOG_INFO,0,"installing %s (%s on subnet %s) as vif #%u - rate=%d",
 	    v->uv_name, inet_fmt(addr, s1), inet_fmts(subnet, mask, s2),
 	    numvifs, v->uv_rate_limit);
 
diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h
index acbd455afc9..c7fd46bdb5e 100644
--- a/usr.sbin/mrouted/defs.h
+++ b/usr.sbin/mrouted/defs.h
@@ -147,7 +147,7 @@ extern char *		sys_errlist[];
 #endif
 
 /* main.c */
-extern void		log(int, int, char *, ...);
+extern void		logit(int, int, char *, ...);
 extern int		register_input_handler(int fd, ihfunc_t func);
 
 /* igmp.c */
diff --git a/usr.sbin/mrouted/igmp.c b/usr.sbin/mrouted/igmp.c
index 0fbd8ef33b8..6ae59323cf8 100644
--- a/usr.sbin/mrouted/igmp.c
+++ b/usr.sbin/mrouted/igmp.c
@@ -44,7 +44,7 @@ init_igmp(void)
     send_buf = malloc(RECV_BUF_SIZE);
 
     if ((igmp_socket = socket(AF_INET, SOCK_RAW, IPPROTO_IGMP)) < 0)
-	log(LOG_ERR, errno, "IGMP socket");
+	logit(LOG_ERR, errno, "IGMP socket");
 
     k_hdr_include(TRUE);	/* include IP header when sending */
     k_set_rcvbuf(48*1024);	/* lots of input buffering        */
@@ -127,7 +127,7 @@ accept_igmp(int recvlen)
     int ipdatalen, iphdrlen, igmpdatalen;
 
     if (recvlen < sizeof(struct ip)) {
-	log(LOG_WARNING, 0,
+	logit(LOG_WARNING, 0,
 	    "received packet too short (%u bytes) for IP header", recvlen);
 	return;
     }
@@ -143,7 +143,7 @@ accept_igmp(int recvlen)
      */
     if (ip->ip_p == 0) {
 	if (src == 0 || dst == 0)
-	    log(LOG_WARNING, 0, "kernel request not accurate");
+	    logit(LOG_WARNING, 0, "kernel request not accurate");
 	else
 	    add_table_entry(src, dst);
 	return;
@@ -152,7 +152,7 @@ accept_igmp(int recvlen)
     iphdrlen  = ip->ip_hl << 2;
     ipdatalen = ntohs(ip->ip_len);
     if (iphdrlen + ipdatalen != recvlen) {
-	log(LOG_WARNING, 0,
+	logit(LOG_WARNING, 0,
 	    "received packet from %s shorter (%u bytes) than hdr+data length (%u+%u)",
 	    inet_fmt(src, s1), recvlen, iphdrlen, ipdatalen);
 	return;
@@ -162,13 +162,13 @@ accept_igmp(int recvlen)
     group       = igmp->igmp_group.s_addr;
     igmpdatalen = ipdatalen - IGMP_MINLEN;
     if (igmpdatalen < 0) {
-	log(LOG_WARNING, 0,
+	logit(LOG_WARNING, 0,
 	    "received IP data field too short (%u bytes) for IGMP, from %s",
 	    ipdatalen, inet_fmt(src, s1));
 	return;
     }
 
-    log(LOG_DEBUG, 0, "RECV %s from %-15s to %s",
+    logit(LOG_DEBUG, 0, "RECV %s from %-15s to %s",
 	packet_kind(igmp->igmp_type, igmp->igmp_code),
 	inet_fmt(src, s1), inet_fmt(dst, s2));
 
@@ -241,7 +241,7 @@ accept_igmp(int recvlen)
 		    return;
 
 		default:
-		    log(LOG_INFO, 0,
+		    logit(LOG_INFO, 0,
 		     "ignoring unknown DVMRP message code %u from %s to %s",
 		     igmp->igmp_code, inet_fmt(src, s1),
 		     inet_fmt(dst, s2));
@@ -260,7 +260,7 @@ accept_igmp(int recvlen)
 	    return;
 
 	default:
-	    log(LOG_INFO, 0,
+	    logit(LOG_INFO, 0,
 		"ignoring unknown IGMP message type %x from %s to %s",
 		igmp->igmp_type, inet_fmt(src, s1),
 		inet_fmt(dst, s2));
@@ -337,7 +337,7 @@ send_igmp(u_int32_t src, u_int32_t dst, int type, int code,
 	if (errno == ENETDOWN)
 	    check_vif_state();
 	else
-	    log(igmp_log_level(type, code), errno,
+	    logit(igmp_log_level(type, code), errno,
 		"sendto to %s on %s",
 		inet_fmt(dst, s1), inet_fmt(src, s2));
     }
@@ -345,6 +345,6 @@ send_igmp(u_int32_t src, u_int32_t dst, int type, int code,
     if (setloop)
 	    k_set_loop(FALSE);
 
-    log(LOG_DEBUG, 0, "SENT %s from %-15s to %s",
+    logit(LOG_DEBUG, 0, "SENT %s from %-15s to %s",
 	packet_kind(type, code), inet_fmt(src, s1), inet_fmt(dst, s2));
 }
diff --git a/usr.sbin/mrouted/kern.c b/usr.sbin/mrouted/kern.c
index 3e972785ba3..89171d2b19b 100644
--- a/usr.sbin/mrouted/kern.c
+++ b/usr.sbin/mrouted/kern.c
@@ -17,7 +17,7 @@ void k_set_rcvbuf(int bufsize)
 {
     if (setsockopt(igmp_socket, SOL_SOCKET, SO_RCVBUF,
 		   (char *)&bufsize, sizeof(bufsize)) < 0)
-	log(LOG_ERR, errno, "setsockopt SO_RCVBUF %u", bufsize);
+	logit(LOG_ERR, errno, "setsockopt SO_RCVBUF %u", bufsize);
 }
 
 
@@ -26,7 +26,7 @@ void k_hdr_include(int bool)
 #ifdef IP_HDRINCL
     if (setsockopt(igmp_socket, IPPROTO_IP, IP_HDRINCL,
 		   (char *)&bool, sizeof(bool)) < 0)
-	log(LOG_ERR, errno, "setsockopt IP_HDRINCL %u", bool);
+	logit(LOG_ERR, errno, "setsockopt IP_HDRINCL %u", bool);
 #endif
 }
 
@@ -38,7 +38,7 @@ void k_set_ttl(int t)
     ttl = t;
     if (setsockopt(igmp_socket, IPPROTO_IP, IP_MULTICAST_TTL,
 		   (char *)&ttl, sizeof(ttl)) < 0)
-	log(LOG_ERR, errno, "setsockopt IP_MULTICAST_TTL %u", ttl);
+	logit(LOG_ERR, errno, "setsockopt IP_MULTICAST_TTL %u", ttl);
 }
 
 
@@ -49,7 +49,7 @@ void k_set_loop(int l)
     loop = l;
     if (setsockopt(igmp_socket, IPPROTO_IP, IP_MULTICAST_LOOP,
 		   (char *)&loop, sizeof(loop)) < 0)
-	log(LOG_ERR, errno, "setsockopt IP_MULTICAST_LOOP %u", loop);
+	logit(LOG_ERR, errno, "setsockopt IP_MULTICAST_LOOP %u", loop);
 }
 
 
@@ -60,7 +60,7 @@ void k_set_if(u_int32_t ifa)
     adr.s_addr = ifa;
     if (setsockopt(igmp_socket, IPPROTO_IP, IP_MULTICAST_IF,
 		   (char *)&adr, sizeof(adr)) < 0)
-	log(LOG_ERR, errno, "setsockopt IP_MULTICAST_IF %s",
+	logit(LOG_ERR, errno, "setsockopt IP_MULTICAST_IF %s",
 			    inet_fmt(ifa, s1));
 }
 
@@ -74,7 +74,7 @@ void k_join(u_int32_t grp, u_int32_t ifa)
 
     if (setsockopt(igmp_socket, IPPROTO_IP, IP_ADD_MEMBERSHIP,
 		   (char *)&mreq, sizeof(mreq)) < 0)
-	log(LOG_WARNING, errno, "can't join group %s on interface %s",
+	logit(LOG_WARNING, errno, "can't join group %s on interface %s",
 				inet_fmt(grp, s1), inet_fmt(ifa, s2));
 }
 
@@ -88,7 +88,7 @@ void k_leave(u_int32_t grp, u_int32_t ifa)
 
     if (setsockopt(igmp_socket, IPPROTO_IP, IP_DROP_MEMBERSHIP,
 		   (char *)&mreq, sizeof(mreq)) < 0)
-	log(LOG_WARNING, errno, "can't leave group %s on interface %s",
+	logit(LOG_WARNING, errno, "can't leave group %s on interface %s",
 				inet_fmt(grp, s1), inet_fmt(ifa, s2));
 }
 
@@ -104,7 +104,7 @@ void k_init_dvmrp(void)
     if (setsockopt(igmp_socket, IPPROTO_IP, MRT_INIT,
 		   (char *)&v, sizeof(int)) < 0)
 #endif
-	log(LOG_ERR, errno, "can't enable Multicast routing in kernel");
+	logit(LOG_ERR, errno, "can't enable Multicast routing in kernel");
 }
 
 
@@ -112,7 +112,7 @@ void k_stop_dvmrp(void)
 {
     if (setsockopt(igmp_socket, IPPROTO_IP, MRT_DONE,
 		   (char *)NULL, 0) < 0)
-	log(LOG_WARNING, errno, "can't disable Multicast routing in kernel");
+	logit(LOG_WARNING, errno, "can't disable Multicast routing in kernel");
 }
 
 
@@ -129,7 +129,7 @@ void k_add_vif(vifi_t vifi, struct uvif *v)
 
     if (setsockopt(igmp_socket, IPPROTO_IP, MRT_ADD_VIF,
 		   (char *)&vc, sizeof(vc)) < 0)
-	log(LOG_ERR, errno, "setsockopt MRT_ADD_VIF");
+	logit(LOG_ERR, errno, "setsockopt MRT_ADD_VIF");
 }
 
 
@@ -137,7 +137,7 @@ void k_del_vif(vifi_t vifi)
 {
     if (setsockopt(igmp_socket, IPPROTO_IP, MRT_DEL_VIF,
 		   (char *)&vifi, sizeof(vifi)) < 0)
-	log(LOG_ERR, errno, "setsockopt MRT_DEL_VIF");
+	logit(LOG_ERR, errno, "setsockopt MRT_DEL_VIF");
 }
 
 
@@ -150,7 +150,7 @@ void k_add_rg(u_int32_t origin, struct gtable *g)
     vifi_t i;
 
 #ifdef DEBUG_MFC
-    md_log(MD_ADD, origin, g->gt_mcastgrp);
+    md_logit(MD_ADD, origin, g->gt_mcastgrp);
 #endif
     /* copy table values so that setsockopt can process it */
     mc.mfcc_origin.s_addr = origin;
@@ -166,9 +166,9 @@ void k_add_rg(u_int32_t origin, struct gtable *g)
     if (setsockopt(igmp_socket, IPPROTO_IP, MRT_ADD_MFC,
 		   (char *)&mc, sizeof(mc)) < 0) {
 #ifdef DEBUG_MFC
-	md_log(MD_ADD_FAIL, origin, g->gt_mcastgrp);
+	md_logit(MD_ADD_FAIL, origin, g->gt_mcastgrp);
 #endif
-	log(LOG_WARNING, errno, "setsockopt MRT_ADD_MFC");
+	logit(LOG_WARNING, errno, "setsockopt MRT_ADD_MFC");
     }
 }
 
@@ -182,7 +182,7 @@ int k_del_rg(u_int32_t origin, struct gtable *g)
     int retval;
 
 #ifdef DEBUG_MFC
-    md_log(MD_DEL, origin, g->gt_mcastgrp);
+    md_logit(MD_DEL, origin, g->gt_mcastgrp);
 #endif
     /* copy table values so that setsockopt can process it */
     mc.mfcc_origin.s_addr = origin;
@@ -195,9 +195,9 @@ int k_del_rg(u_int32_t origin, struct gtable *g)
     if ((retval = setsockopt(igmp_socket, IPPROTO_IP, MRT_DEL_MFC,
 		   (char *)&mc, sizeof(mc))) < 0) {
 #ifdef DEBUG_MFC
-	md_log(MD_DEL_FAIL, origin, g->gt_mcastgrp);
+	md_logit(MD_DEL_FAIL, origin, g->gt_mcastgrp);
 #endif
-	log(LOG_WARNING, errno, "setsockopt MRT_DEL_MFC");
+	logit(LOG_WARNING, errno, "setsockopt MRT_DEL_MFC");
     }
 
     return retval;
@@ -216,7 +216,7 @@ int k_get_version(void)
 
     if (getsockopt(igmp_socket, IPPROTO_IP, MRT_VERSION,
 			(char *)&vers, &len) < 0)
-	log(LOG_ERR, errno,
+	logit(LOG_ERR, errno,
 		"getsockopt MRT_VERSION: perhaps your kernel is too old");
 
     return vers;
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index 22dbe769643..e8085894dca 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static char rcsid[] =
-	"@(#) $Id: main.c,v 1.13 2003/03/12 22:55:01 deraadt Exp $";
+	"@(#) $Id: main.c,v 1.14 2003/11/26 01:17:12 millert Exp $";
 #endif
 
 extern char *configfilename;
@@ -182,7 +182,7 @@ usage:	fprintf(stderr,
     snprintf(versionstring, sizeof versionstring, "mrouted version %d.%d",
 			PROTOCOL_VERSION, MROUTED_VERSION);
 
-    log(LOG_NOTICE, 0, "%s", versionstring);
+    logit(LOG_NOTICE, 0, "%s", versionstring);
 
 #ifdef SYSV
     srand48(time(NULL));
@@ -223,7 +223,7 @@ usage:	fprintf(stderr,
      */
     if ((((vers >> 8) & 0xff) != 3) ||
 	 ((vers & 0xff) != 5))
-	log(LOG_ERR, 0, "kernel (v%d.%d)/mrouted (v%d.%d) version mismatch",
+	logit(LOG_ERR, 0, "kernel (v%d.%d)/mrouted (v%d.%d) version mismatch",
 		(vers >> 8) & 0xff, vers & 0xff,
 		PROTOCOL_VERSION, MROUTED_VERSION);
 #endif
@@ -272,12 +272,12 @@ usage:	fprintf(stderr,
 
     FD_ZERO(&readers);
     if (igmp_socket >= FD_SETSIZE)
-	log(LOG_ERR, 0, "descriptor too big");
+	logit(LOG_ERR, 0, "descriptor too big");
     FD_SET(igmp_socket, &readers);
     nfds = igmp_socket + 1;
     for (i = 0; i < nhandlers; i++) {
 	if (ihandlers[i].fd >= FD_SETSIZE)
-	    log(LOG_ERR, 0, "descriptor too big");
+	    logit(LOG_ERR, 0, "descriptor too big");
 	FD_SET(ihandlers[i].fd, &readers);
 	if (ihandlers[i].fd >= nfds)
 	    nfds = ihandlers[i].fd + 1;
@@ -331,7 +331,7 @@ usage:	fprintf(stderr,
 #endif
    {
             if (errno != EINTR) /* SIGALRM is expected */
-                log(LOG_WARNING, errno, "select failed");
+                logit(LOG_WARNING, errno, "select failed");
             continue;
         }
 
@@ -339,13 +339,13 @@ usage:	fprintf(stderr,
 	    recvlen = recvfrom(igmp_socket, recv_buf, RECV_BUF_SIZE,
 			       0, NULL, &dummy);
 	    if (recvlen < 0) {
-		if (errno != EINTR) log(LOG_ERR, errno, "recvfrom");
+		if (errno != EINTR) logit(LOG_ERR, errno, "recvfrom");
 		continue;
 	    }
 	    (void)sigemptyset(&mask);
 	    (void)sigaddset(&mask, SIGALRM);
 	    if (sigprocmask(SIG_BLOCK, &mask, &omask) < 0)
-		    log(LOG_ERR, errno, "sigprocmask");
+		    logit(LOG_ERR, errno, "sigprocmask");
 	    accept_igmp(recvlen);
 	    (void)sigprocmask(SIG_SETMASK, &omask, NULL);
         }
@@ -489,7 +489,7 @@ timer(void)
 static void
 done(int i)
 {
-    log(LOG_NOTICE, 0, "%s exiting", versionstring);
+    logit(LOG_NOTICE, 0, "%s exiting", versionstring);
     cleanup();
     _exit(1);
 }
@@ -563,7 +563,7 @@ restart(int i)
 {
     sigset_t mask, omask;
 
-    log(LOG_NOTICE, 0, "%s restart", versionstring);
+    logit(LOG_NOTICE, 0, "%s restart", versionstring);
 
     /*
      * reset all the entries
@@ -571,7 +571,7 @@ restart(int i)
     (void)sigemptyset(&mask);
     (void)sigaddset(&mask, SIGALRM);
     if (sigprocmask(SIG_BLOCK, &mask, &omask) < 0)
-	log(LOG_ERR, errno, "sigprocmask");
+	logit(LOG_ERR, errno, "sigprocmask");
     free_all_prunes();
     free_all_routes();
     stop_all_vifs();
@@ -623,7 +623,7 @@ resetlogging(void *arg)
  * For errors of severity LOG_ERR or worse, terminate the program.
  */
 void
-log(int severity, int syserr, char *format, ...)
+logit(int severity, int syserr, char *format, ...)
 {
     va_list ap;
     static char fmt[211] = "warning - ";
@@ -672,7 +672,7 @@ log(int severity, int syserr, char *format, ...)
 
 #ifdef DEBUG_MFC
 void
-md_log(int what, u_int32_t origin, u_int32_t mcastgrp)
+md_logit(int what, u_int32_t origin, u_int32_t mcastgrp)
 {
     static FILE *f = NULL;
     struct timeval tv;
@@ -680,7 +680,7 @@ md_log(int what, u_int32_t origin, u_int32_t mcastgrp)
 
     if (!f) {
 	if ((f = fopen("/tmp/mrouted.clog", "w")) == NULL) {
-	    log(LOG_ERR, errno, "open /tmp/mrouted.clog");
+	    logit(LOG_ERR, errno, "open /tmp/mrouted.clog");
 	}
     }
 
diff --git a/usr.sbin/mrouted/prune.c b/usr.sbin/mrouted/prune.c
index 321c4e0720c..2adbf3d37f3 100644
--- a/usr.sbin/mrouted/prune.c
+++ b/usr.sbin/mrouted/prune.c
@@ -281,7 +281,7 @@ send_prune(struct gtable *gt)
     send_igmp(src, dst, IGMP_DVMRP, DVMRP_PRUNE,
 	      htonl(MROUTED_LEVEL), datalen);
 
-    log(LOG_DEBUG, 0, "sent prune for (%s %s)/%d on vif %d to %s",
+    logit(LOG_DEBUG, 0, "sent prune for (%s %s)/%d on vif %d to %s",
       inet_fmts(gt->gt_route->rt_origin, gt->gt_route->rt_originmask, s1),
       inet_fmt(gt->gt_mcastgrp, s2),
       gt->gt_prsent_timer, gt->gt_route->rt_parent,
@@ -324,7 +324,7 @@ send_graft(struct gtable *gt)
 	send_igmp(src, dst, IGMP_DVMRP, DVMRP_GRAFT,
 		  htonl(MROUTED_LEVEL), datalen);
     }
-    log(LOG_DEBUG, 0, "sent graft for (%s %s) to %s on vif %d",
+    logit(LOG_DEBUG, 0, "sent graft for (%s %s) to %s on vif %d",
 	inet_fmts(gt->gt_route->rt_origin, gt->gt_route->rt_originmask, s1),
 	inet_fmt(gt->gt_mcastgrp, s2),
 	inet_fmt(gt->gt_route->rt_gateway, s3), gt->gt_route->rt_parent);
@@ -352,7 +352,7 @@ send_graft_ack(u_int32_t src, u_int32_t dst, u_int32_t origin, u_int32_t grp)
     send_igmp(src, dst, IGMP_DVMRP, DVMRP_GRAFT_ACK,
 	      htonl(MROUTED_LEVEL), datalen);
 
-    log(LOG_DEBUG, 0, "sent graft ack for (%s, %s) to %s",
+    logit(LOG_DEBUG, 0, "sent graft ack for (%s, %s) to %s",
 	inet_fmt(origin, s1), inet_fmt(grp, s2), inet_fmt(dst, s3));
 }
 
@@ -594,7 +594,7 @@ add_table_entry(u_int32_t origin, u_int32_t mcastgrp)
     vifi_t i;
 
 #ifdef DEBUG_MFC
-    md_log(MD_MISS, origin, mcastgrp);
+    md_logit(MD_MISS, origin, mcastgrp);
 #endif
 
     r = determine_route(origin);
@@ -622,7 +622,7 @@ add_table_entry(u_int32_t origin, u_int32_t mcastgrp)
     if (gt == NULL || gt->gt_mcastgrp != mcastgrp) {
 	gt = (struct gtable *)malloc(sizeof(struct gtable));
 	if (gt == NULL)
-	    log(LOG_ERR, 0, "ran out of memory");
+	    logit(LOG_ERR, 0, "ran out of memory");
 
 	gt->gt_mcastgrp	    = mcastgrp;
 	gt->gt_timer	    = CACHE_LIFETIME(cache_lifetime);
@@ -671,7 +671,7 @@ add_table_entry(u_int32_t origin, u_int32_t mcastgrp)
 		struct gtable *g;
 
 		g = gtp ? gtp->gt_gnext : kernel_table;
-		log(LOG_WARNING, 0, "Entry for (%s %s) (rt:%x) exists (rt:%x)",
+		logit(LOG_WARNING, 0, "Entry for (%s %s) (rt:%x) exists (rt:%x)",
 		    inet_fmts(r->rt_origin, r->rt_originmask, s1),
 		    inet_fmt(g->gt_mcastgrp, s2),
 		    r, g->gt_route);
@@ -703,7 +703,7 @@ add_table_entry(u_int32_t origin, u_int32_t mcastgrp)
     if (st == NULL || st->st_origin != origin) {
 	st = (struct stable *)malloc(sizeof(struct stable));
 	if (st == NULL)
-	    log(LOG_ERR, 0, "ran out of memory");
+	    logit(LOG_ERR, 0, "ran out of memory");
 
 	st->st_origin = origin;
 	st->st_pktcnt = 0;
@@ -711,9 +711,9 @@ add_table_entry(u_int32_t origin, u_int32_t mcastgrp)
 	*stnp = st;
     } else {
 #ifdef DEBUG_MFC
-	md_log(MD_DUPE, origin, mcastgrp);
+	md_logit(MD_DUPE, origin, mcastgrp);
 #endif
-	log(LOG_WARNING, 0, "kernel entry already exists for (%s %s)",
+	logit(LOG_WARNING, 0, "kernel entry already exists for (%s %s)",
 		inet_fmt(origin, s1), inet_fmt(mcastgrp, s2));
 	/* XXX Doing this should cause no harm, and may ensure
 	 * kernel<>mrouted synchronization */
@@ -724,7 +724,7 @@ add_table_entry(u_int32_t origin, u_int32_t mcastgrp)
     kroutes++;
     k_add_rg(origin, gt);
 
-    log(LOG_DEBUG, 0, "add cache entry (%s %s) gm:%x, parent-vif:%d",
+    logit(LOG_DEBUG, 0, "add cache entry (%s %s) gm:%x, parent-vif:%d",
 	inet_fmt(origin, s1),
 	inet_fmt(mcastgrp, s2),
 	gt->gt_grpmems, r ? r->rt_parent : -1);
@@ -759,7 +759,7 @@ reset_neighbor_state(vifi_t vifi, u_int32_t addr)
 	 */
 	if (vifi == r->rt_parent) {
 	    if (addr == r->rt_gateway) {
-		log(LOG_DEBUG, 0, "reset_neighbor_state parent reset (%s %s)",
+		logit(LOG_DEBUG, 0, "reset_neighbor_state parent reset (%s %s)",
 		    inet_fmts(r->rt_origin, r->rt_originmask, s1),
 		    inet_fmt(g->gt_mcastgrp, s2));
 
@@ -816,7 +816,7 @@ reset_neighbor_state(vifi_t vifi, u_int32_t addr)
 		rsrr_cache_send(g,1);
 #endif /* RSRR */
 
-		log(LOG_DEBUG, 0, "reset member state (%s %s) gm:%x",
+		logit(LOG_DEBUG, 0, "reset member state (%s %s) gm:%x",
 		    inet_fmts(r->rt_origin, r->rt_originmask, s1),
 		    inet_fmt(g->gt_mcastgrp, s2), g->gt_grpmems);
 	    }
@@ -838,13 +838,13 @@ del_table_entry(struct rtentry *r, u_int32_t mcastgrp, u_int del_flag)
     if (del_flag == DEL_ALL_ROUTES) {
 	g = r->rt_groups;
 	while (g) {
-	    log(LOG_DEBUG, 0, "del_table_entry deleting (%s %s)",
+	    logit(LOG_DEBUG, 0, "del_table_entry deleting (%s %s)",
 		inet_fmts(r->rt_origin, r->rt_originmask, s1),
 		inet_fmt(g->gt_mcastgrp, s2));
 	    st = g->gt_srctbl;
 	    while (st) {
 		if (k_del_rg(st->st_origin, g) < 0) {
-		    log(LOG_WARNING, errno,
+		    logit(LOG_WARNING, errno,
 			"del_table_entry trying to delete (%s, %s)",
 			inet_fmt(st->st_origin, s1),
 			inet_fmt(g->gt_mcastgrp, s2));
@@ -890,13 +890,13 @@ del_table_entry(struct rtentry *r, u_int32_t mcastgrp, u_int del_flag)
 	prev_g = (struct gtable *)&r->rt_groups;
 	for (g = r->rt_groups; g; g = g->gt_next) {
 	    if (g->gt_mcastgrp == mcastgrp) {
-		log(LOG_DEBUG, 0, "del_table_entry deleting (%s %s)",
+		logit(LOG_DEBUG, 0, "del_table_entry deleting (%s %s)",
 		    inet_fmts(r->rt_origin, r->rt_originmask, s1),
 		    inet_fmt(g->gt_mcastgrp, s2));
 		st = g->gt_srctbl;
 		while (st) {
 		    if (k_del_rg(st->st_origin, g) < 0) {
-			log(LOG_WARNING, errno,
+			logit(LOG_WARNING, errno,
 			    "del_table_entry trying to delete (%s, %s)",
 			    inet_fmt(st->st_origin, s1),
 			    inet_fmt(g->gt_mcastgrp, s2));
@@ -977,7 +977,7 @@ update_table_entry(struct rtentry *r)
 	    g->gt_scope = -1;
 	g->gt_grpmems &= ~g->gt_scope;
 
-	log(LOG_DEBUG, 0, "updating cache entries (%s %s) gm:%x",
+	logit(LOG_DEBUG, 0, "updating cache entries (%s %s) gm:%x",
 	    inet_fmts(r->rt_origin, r->rt_originmask, s1),
 	    inet_fmt(g->gt_mcastgrp, s2),
 	    g->gt_grpmems);
@@ -1013,7 +1013,7 @@ update_lclgrp(vifi_t vifi, u_int32_t mcastgrp)
     struct rtentry *r;
     struct gtable *g;
 
-    log(LOG_DEBUG, 0, "group %s joined on vif %d",
+    logit(LOG_DEBUG, 0, "group %s joined on vif %d",
 	inet_fmt(mcastgrp, s1), vifi);
 
     for (g = kernel_table; g; g = g->gt_gnext) {
@@ -1030,7 +1030,7 @@ update_lclgrp(vifi_t vifi, u_int32_t mcastgrp)
 		continue;
 
 	    prun_add_ttls(g);
-	    log(LOG_DEBUG, 0, "update lclgrp (%s %s) gm:%x",
+	    logit(LOG_DEBUG, 0, "update lclgrp (%s %s) gm:%x",
 		inet_fmts(r->rt_origin, r->rt_originmask, s1),
 		inet_fmt(g->gt_mcastgrp, s2), g->gt_grpmems);
 
@@ -1052,7 +1052,7 @@ delete_lclgrp(vifi_t vifi, u_int32_t mcastgrp)
     struct rtentry *r;
     struct gtable *g;
 
-    log(LOG_DEBUG, 0, "group %s left on vif %d",
+    logit(LOG_DEBUG, 0, "group %s left on vif %d",
 	inet_fmt(mcastgrp, s1), vifi);
 
     for (g = kernel_table; g; g = g->gt_gnext) {
@@ -1079,7 +1079,7 @@ delete_lclgrp(vifi_t vifi, u_int32_t mcastgrp)
 
 	    if (stop_sending) {
 		VIFM_CLR(vifi, g->gt_grpmems);
-		log(LOG_DEBUG, 0, "delete lclgrp (%s %s) gm:%x",
+		logit(LOG_DEBUG, 0, "delete lclgrp (%s %s) gm:%x",
 		    inet_fmts(r->rt_origin, r->rt_originmask, s1),
 		    inet_fmt(g->gt_mcastgrp, s2), g->gt_grpmems);
 
@@ -1130,7 +1130,7 @@ accept_prune(u_int32_t src, u_int32_t dst, char *p, int datalen)
 	return;
 
     if ((vifi = find_vif(src, dst)) == NO_VIF) {
-	log(LOG_INFO, 0,
+	logit(LOG_INFO, 0,
 	    "ignoring prune report from non-neighbor %s",
 	    inet_fmt(src, s1));
 	return;
@@ -1139,7 +1139,7 @@ accept_prune(u_int32_t src, u_int32_t dst, char *p, int datalen)
     /* Check if enough data is present */
     if (datalen < 12)
 	{
-	    log(LOG_WARNING, 0,
+	    logit(LOG_WARNING, 0,
 		"non-decipherable prune from %s",
 		inet_fmt(src, s1));
 	    return;
@@ -1153,7 +1153,7 @@ accept_prune(u_int32_t src, u_int32_t dst, char *p, int datalen)
 	((char *)&prun_tmr)[i] = *p++;
     prun_tmr = ntohl(prun_tmr);
 
-    log(LOG_DEBUG, 0, "%s on vif %d prunes (%s %s)/%d",
+    logit(LOG_DEBUG, 0, "%s on vif %d prunes (%s %s)/%d",
 	inet_fmt(src, s1), vifi,
 	inet_fmt(prun_src, s2), inet_fmt(prun_grp, s3), prun_tmr);
 
@@ -1165,13 +1165,13 @@ accept_prune(u_int32_t src, u_int32_t dst, char *p, int datalen)
 	r = g->gt_route;
 
 	if (!VIFM_ISSET(vifi, r->rt_children)) {
-	    log(LOG_WARNING, 0, "prune received from non-child %s for (%s %s)",
+	    logit(LOG_WARNING, 0, "prune received from non-child %s for (%s %s)",
 		inet_fmt(src, s1), inet_fmt(prun_src, s2),
 		inet_fmt(prun_grp, s3));
 	    return;
 	}
 	if (VIFM_ISSET(vifi, g->gt_scope)) {
-	    log(LOG_WARNING, 0, "prune received from %s on scoped grp (%s %s)",
+	    logit(LOG_WARNING, 0, "prune received from %s on scoped grp (%s %s)",
 		inet_fmt(src, s1), inet_fmt(prun_src, s2),
 		inet_fmt(prun_grp, s3));
 	    return;
@@ -1182,7 +1182,7 @@ accept_prune(u_int32_t src, u_int32_t dst, char *p, int datalen)
 	     * of timer granularity, so don't warn about it.
 	     */
 	    if (pt->pt_timer > 10) {
-		log(LOG_WARNING, 0, "%s %d from %s for (%s %s)/%d %s %d %s %x",
+		logit(LOG_WARNING, 0, "%s %d from %s for (%s %s)/%d %s %d %s %x",
 		    "duplicate prune received on vif",
 		    vifi, inet_fmt(src, s1), inet_fmt(prun_src, s2),
 		    inet_fmt(prun_grp, s3), prun_tmr,
@@ -1193,7 +1193,7 @@ accept_prune(u_int32_t src, u_int32_t dst, char *p, int datalen)
 	    /* allocate space for the prune structure */
 	    pt = (struct ptable *)(malloc(sizeof(struct ptable)));
 	    if (pt == NULL)
-	      log(LOG_ERR, 0, "pt: ran out of memory");
+	      logit(LOG_ERR, 0, "pt: ran out of memory");
 
 	    pt->pt_vifi = vifi;
 	    pt->pt_router = src;
@@ -1221,7 +1221,7 @@ accept_prune(u_int32_t src, u_int32_t dst, char *p, int datalen)
 
 	if (stop_sending && !grplst_mem(vifi, prun_grp)) {
 	    VIFM_CLR(vifi, g->gt_grpmems);
-	    log(LOG_DEBUG, 0, "prune (%s %s), stop sending on vif %d, gm:%x",
+	    logit(LOG_DEBUG, 0, "prune (%s %s), stop sending on vif %d, gm:%x",
 		inet_fmts(r->rt_origin, r->rt_originmask, s1),
 		inet_fmt(g->gt_mcastgrp, s2), vifi, g->gt_grpmems);
 
@@ -1248,7 +1248,7 @@ accept_prune(u_int32_t src, u_int32_t dst, char *p, int datalen)
 	 * simply ignore the prune, as we are not forwarding this traffic
 	 * downstream.
 	 */
-	log(LOG_DEBUG, 0, "%s (%s %s)/%d from %s",
+	logit(LOG_DEBUG, 0, "%s (%s %s)/%d from %s",
 	    "prune message received with no kernel entry for",
 	    inet_fmt(prun_src, s1), inet_fmt(prun_grp, s2),
 	    prun_tmr, inet_fmt(src, s3));
@@ -1293,7 +1293,7 @@ chkgrp_graft(vifi_t vifi, u_int32_t mcastgrp)
 		g->gt_prsent_timer = 0;
 		g->gt_timer = max_prune_lifetime;
 
-		log(LOG_DEBUG, 0, "chkgrp graft (%s %s) gm:%x",
+		logit(LOG_DEBUG, 0, "chkgrp graft (%s %s) gm:%x",
 		    inet_fmts(r->rt_origin, r->rt_originmask, s1),
 		    inet_fmt(g->gt_mcastgrp, s2), g->gt_grpmems);
 
@@ -1331,14 +1331,14 @@ accept_graft(u_int32_t src, u_int32_t dst, char *p, int datalen)
     struct ptable *pt, **ptnp;
 
     if ((vifi = find_vif(src, dst)) == NO_VIF) {
-	log(LOG_INFO, 0,
+	logit(LOG_INFO, 0,
 	    "ignoring graft from non-neighbor %s",
 	    inet_fmt(src, s1));
 	return;
     }
 
     if (datalen < 8) {
-	log(LOG_WARNING, 0,
+	logit(LOG_WARNING, 0,
 	    "received non-decipherable graft from %s",
 	    inet_fmt(src, s1));
 	return;
@@ -1349,7 +1349,7 @@ accept_graft(u_int32_t src, u_int32_t dst, char *p, int datalen)
     for (i = 0; i< 4; i++)
 	((char *)&graft_grp)[i] = *p++;
 
-    log(LOG_DEBUG, 0, "%s on vif %d grafts (%s %s)",
+    logit(LOG_DEBUG, 0, "%s on vif %d grafts (%s %s)",
 	inet_fmt(src, s1), vifi,
 	inet_fmt(graft_src, s2), inet_fmt(graft_grp, s3));
 
@@ -1361,7 +1361,7 @@ accept_graft(u_int32_t src, u_int32_t dst, char *p, int datalen)
 	r = g->gt_route;
 
 	if (VIFM_ISSET(vifi, g->gt_scope)) {
-	    log(LOG_WARNING, 0, "graft received from %s on scoped grp (%s %s)",
+	    logit(LOG_WARNING, 0, "graft received from %s on scoped grp (%s %s)",
 		inet_fmt(src, s1), inet_fmt(graft_src, s2),
 		inet_fmt(graft_grp, s3));
 	    return;
@@ -1374,7 +1374,7 @@ accept_graft(u_int32_t src, u_int32_t dst, char *p, int datalen)
 		free(pt);
 
 		VIFM_SET(vifi, g->gt_grpmems);
-		log(LOG_DEBUG, 0, "accept graft (%s %s) gm:%x",
+		logit(LOG_DEBUG, 0, "accept graft (%s %s) gm:%x",
 		    inet_fmts(r->rt_origin, r->rt_originmask, s1),
 		    inet_fmt(g->gt_mcastgrp, s2), g->gt_grpmems);
 
@@ -1412,7 +1412,7 @@ accept_graft(u_int32_t src, u_int32_t dst, char *p, int datalen)
 	 * to remove prune state.
 	 */
 	send_graft_ack(dst, src, graft_src, graft_grp);
-	log(LOG_DEBUG, 0, "%s (%s %s) from %s",
+	logit(LOG_DEBUG, 0, "%s (%s %s) from %s",
 	    "graft received with no kernel entry for",
 	    inet_fmt(graft_src, s1), inet_fmt(graft_grp, s2),
 	    inet_fmt(src, s3));
@@ -1438,14 +1438,14 @@ accept_g_ack(u_int32_t src, u_int32_t dst, char *p, int datalen)
     int		i;
 
     if ((vifi = find_vif(src, dst)) == NO_VIF) {
-	log(LOG_INFO, 0,
+	logit(LOG_INFO, 0,
 	    "ignoring graft ack from non-neighbor %s",
 	    inet_fmt(src, s1));
 	return;
     }
 
     if (datalen < 0  || datalen > 8) {
-	log(LOG_WARNING, 0,
+	logit(LOG_WARNING, 0,
 	    "received non-decipherable graft ack from %s",
 	    inet_fmt(src, s1));
 	return;
@@ -1456,7 +1456,7 @@ accept_g_ack(u_int32_t src, u_int32_t dst, char *p, int datalen)
     for (i = 0; i< 4; i++)
 	((char *)&grft_grp)[i] = *p++;
 
-    log(LOG_DEBUG, 0, "%s on vif %d acks graft (%s, %s)",
+    logit(LOG_DEBUG, 0, "%s on vif %d acks graft (%s, %s)",
 	inet_fmt(src, s1), vifi,
 	inet_fmt(grft_src, s2), inet_fmt(grft_grp, s3));
 
@@ -1467,7 +1467,7 @@ accept_g_ack(u_int32_t src, u_int32_t dst, char *p, int datalen)
 	g = gtp ? gtp->gt_gnext : kernel_table;
 	g->gt_grftsnt = 0;
     } else {
-	log(LOG_WARNING, 0, "%s (%s, %s) from %s",
+	logit(LOG_WARNING, 0, "%s (%s, %s) from %s",
 	    "rcvd graft ack with no kernel entry for",
 	    inet_fmt(grft_src, s1), inet_fmt(grft_grp, s2),
 	    inet_fmt(src, s3));
@@ -1545,20 +1545,20 @@ steal_sources(struct rtentry *rt)
 
     for (rp = rt->rt_next; rp; rp = rp->rt_next) {
 	if ((rt->rt_origin & rp->rt_originmask) == rp->rt_origin) {
-	    log(LOG_DEBUG, 0, "Route for %s stealing sources from %s",
+	    logit(LOG_DEBUG, 0, "Route for %s stealing sources from %s",
 		inet_fmts(rt->rt_origin, rt->rt_originmask, s1),
 		inet_fmts(rp->rt_origin, rp->rt_originmask, s2));
 	    for (gt = rp->rt_groups; gt; gt = gt->gt_next) {
 		stnp = &gt->gt_srctbl;
 		while ((st = *stnp) != NULL) {
 		    if ((st->st_origin & rt->rt_originmask) == rt->rt_origin) {
-			log(LOG_DEBUG, 0, "%s stealing (%s %s) from %s",
+			logit(LOG_DEBUG, 0, "%s stealing (%s %s) from %s",
 			    inet_fmts(rt->rt_origin, rt->rt_originmask, s1),
 			    inet_fmt(st->st_origin, s3),
 			    inet_fmt(gt->gt_mcastgrp, s4),
 			    inet_fmts(rp->rt_origin, rp->rt_originmask, s2));
 			if (k_del_rg(st->st_origin, gt) < 0) {
-			    log(LOG_WARNING, errno, "%s (%s, %s)",
+			    logit(LOG_WARNING, errno, "%s (%s, %s)",
 				"steal_sources trying to delete",
 				inet_fmt(st->st_origin, s1),
 				inet_fmt(gt->gt_mcastgrp, s2));
@@ -1578,13 +1578,13 @@ steal_sources(struct rtentry *rt)
     while ((gt = *gtnp) != NULL) {
 	if (gt->gt_srctbl && ((gt->gt_srctbl->st_origin & rt->rt_originmask)
 				    == rt->rt_origin)) {
-	    log(LOG_DEBUG, 0, "%s stealing (%s %s) from %s",
+	    logit(LOG_DEBUG, 0, "%s stealing (%s %s) from %s",
 		inet_fmts(rt->rt_origin, rt->rt_originmask, s1),
 		inet_fmt(gt->gt_srctbl->st_origin, s3),
 		inet_fmt(gt->gt_mcastgrp, s4),
 		"no_route table");
 	    if (k_del_rg(gt->gt_srctbl->st_origin, gt) < 0) {
-		log(LOG_WARNING, errno, "%s (%s %s)",
+		logit(LOG_WARNING, errno, "%s (%s %s)",
 		    "steal_sources trying to delete",
 		    inet_fmt(gt->gt_srctbl->st_origin, s1),
 		    inet_fmt(gt->gt_mcastgrp, s2));
@@ -1615,7 +1615,7 @@ age_table_entry(void)
     struct ptable *pt, **ptnp;
     struct sioc_sg_req sg_req;
 
-    log(LOG_DEBUG, 0, "ageing entries");
+    logit(LOG_DEBUG, 0, "ageing entries");
 
     gtnptr = &kernel_table;
     while ((gt = *gtnptr) != NULL) {
@@ -1628,7 +1628,7 @@ age_table_entry(void)
 	if (gt->gt_prsent_timer > 0) {
 	    gt->gt_prsent_timer -= ROUTE_MAX_REPORT_DELAY;
 	    if (gt->gt_prsent_timer <= 0) {
-		log(LOG_DEBUG, 0, "upstream prune tmo (%s %s)",
+		logit(LOG_DEBUG, 0, "upstream prune tmo (%s %s)",
 		    inet_fmts(r->rt_origin, r->rt_originmask, s1),
 		    inet_fmt(gt->gt_mcastgrp, s2));
 		gt->gt_prsent_timer = -1;
@@ -1651,7 +1651,7 @@ age_table_entry(void)
 	ptnp = &gt->gt_pruntbl;
 	while ((pt = *ptnp) != NULL) {
 	    if ((pt->pt_timer -= ROUTE_MAX_REPORT_DELAY) <= 0) {
-		log(LOG_DEBUG, 0, "expire prune (%s %s) from %s on vif %d",
+		logit(LOG_DEBUG, 0, "expire prune (%s %s) from %s on vif %d",
 		    inet_fmts(r->rt_origin, r->rt_originmask, s1),
 		    inet_fmt(gt->gt_mcastgrp, s2),
 		    inet_fmt(pt->pt_router, s3),
@@ -1680,7 +1680,7 @@ age_table_entry(void)
 	    while ((st = *stnp) != NULL) {
 		sg_req.src.s_addr = st->st_origin;
 		if (ioctl(udp_socket, SIOCGETSGCNT, (char *)&sg_req) < 0) {
-		    log(LOG_WARNING, errno, "%s (%s %s)",
+		    logit(LOG_WARNING, errno, "%s (%s %s)",
 			"age_table_entry: SIOCGETSGCNT failing for",
 			inet_fmt(st->st_origin, s1),
 			inet_fmt(gt->gt_mcastgrp, s2));
@@ -1689,11 +1689,11 @@ age_table_entry(void)
 		}
 		if (sg_req.pktcnt == st->st_pktcnt) {
 		    *stnp = st->st_next;
-		    log(LOG_DEBUG, 0, "age_table_entry deleting (%s %s)",
+		    logit(LOG_DEBUG, 0, "age_table_entry deleting (%s %s)",
 			inet_fmt(st->st_origin, s1),
 			inet_fmt(gt->gt_mcastgrp, s2));
 		    if (k_del_rg(st->st_origin, gt) < 0) {
-			log(LOG_WARNING, errno,
+			logit(LOG_WARNING, errno,
 			    "age_table_entry trying to delete (%s %s)",
 			    inet_fmt(st->st_origin, s1),
 			    inet_fmt(gt->gt_mcastgrp, s2));
@@ -1723,7 +1723,7 @@ age_table_entry(void)
 		continue;
 	    }
 
-	    log(LOG_DEBUG, 0, "timeout cache entry (%s, %s)",
+	    logit(LOG_DEBUG, 0, "timeout cache entry (%s, %s)",
 		inet_fmts(r->rt_origin, r->rt_originmask, s1),
 		inet_fmt(gt->gt_mcastgrp, s2));
 
@@ -1772,7 +1772,7 @@ age_table_entry(void)
 	if (gt->gt_timer < 0) {
 	    if (gt->gt_srctbl) {
 		if (k_del_rg(gt->gt_srctbl->st_origin, gt) < 0) {
-		    log(LOG_WARNING, errno, "%s (%s %s)",
+		    logit(LOG_WARNING, errno, "%s (%s %s)",
 			"age_table_entry trying to delete no-route",
 			inet_fmt(gt->gt_srctbl->st_origin, s1),
 			inet_fmt(gt->gt_mcastgrp, s2));
@@ -1803,7 +1803,7 @@ expire_prune(vifi_t vifi, struct gtable *gt)
      * will expire before any prunes that we have received.
      */
     if (gt->gt_prsent_timer > 0) {
-        log(LOG_DEBUG, 0, "prune expired with %d left on %s",
+        logit(LOG_DEBUG, 0, "prune expired with %d left on %s",
 		gt->gt_prsent_timer, "prsent_timer");
         gt->gt_prsent_timer = 0;
     }
@@ -1812,7 +1812,7 @@ expire_prune(vifi_t vifi, struct gtable *gt)
     if (!VIFM_ISSET(vifi, gt->gt_grpmems)) {
         struct rtentry *rt = gt->gt_route;
         VIFM_SET(vifi, gt->gt_grpmems);
-        log(LOG_DEBUG, 0, "forw again (%s %s) gm:%x vif:%d",
+        logit(LOG_DEBUG, 0, "forw again (%s %s) gm:%x vif:%d",
 	inet_fmts(rt->rt_origin, rt->rt_originmask, s1),
 	inet_fmt(gt->gt_mcastgrp, s2), gt->gt_grpmems, vifi);
 
@@ -1961,20 +1961,20 @@ accept_mtrace(u_int32_t src, u_int32_t dst, u_int32_t group,
      */
     if (datalen == QLEN) {
 	type = QUERY;
-	log(LOG_DEBUG, 0, "Initial traceroute query rcvd from %s to %s",
+	logit(LOG_DEBUG, 0, "Initial traceroute query rcvd from %s to %s",
 	    inet_fmt(src, s1), inet_fmt(dst, s2));
     }
     else if ((datalen - QLEN) % RLEN == 0) {
 	type = RESP;
-	log(LOG_DEBUG, 0, "In-transit traceroute query rcvd from %s to %s",
+	logit(LOG_DEBUG, 0, "In-transit traceroute query rcvd from %s to %s",
 	    inet_fmt(src, s1), inet_fmt(dst, s2));
 	if (IN_MULTICAST(ntohl(dst))) {
-	    log(LOG_DEBUG, 0, "Dropping multicast response");
+	    logit(LOG_DEBUG, 0, "Dropping multicast response");
 	    return;
 	}
     }
     else {
-	log(LOG_WARNING, 0, "%s from %s to %s",
+	logit(LOG_WARNING, 0, "%s from %s to %s",
 	    "Non decipherable traceroute request received",
 	    inet_fmt(src, s1), inet_fmt(dst, s2));
 	return;
@@ -1986,25 +1986,25 @@ accept_mtrace(u_int32_t src, u_int32_t dst, u_int32_t group,
      * if it is a packet with all reports filled, drop it
      */
     if ((rcount = (datalen - QLEN)/RLEN) == no) {
-	log(LOG_DEBUG, 0, "packet with all reports filled in");
+	logit(LOG_DEBUG, 0, "packet with all reports filled in");
 	return;
     }
 
-    log(LOG_DEBUG, 0, "s: %s g: %s d: %s ", inet_fmt(qry->tr_src, s1),
+    logit(LOG_DEBUG, 0, "s: %s g: %s d: %s ", inet_fmt(qry->tr_src, s1),
 	    inet_fmt(group, s2), inet_fmt(qry->tr_dst, s3));
-    log(LOG_DEBUG, 0, "rttl: %d rd: %s", qry->tr_rttl,
+    logit(LOG_DEBUG, 0, "rttl: %d rd: %s", qry->tr_rttl,
 	    inet_fmt(qry->tr_raddr, s1));
-    log(LOG_DEBUG, 0, "rcount:%d, qid:%06x", rcount, qry->tr_qid);
+    logit(LOG_DEBUG, 0, "rcount:%d, qid:%06x", rcount, qry->tr_qid);
 
     /* determine the routing table entry for this traceroute */
     rt = determine_route(qry->tr_src);
     if (rt) {
-	log(LOG_DEBUG, 0, "rt parent vif: %d rtr: %s metric: %d",
+	logit(LOG_DEBUG, 0, "rt parent vif: %d rtr: %s metric: %d",
 		rt->rt_parent, inet_fmt(rt->rt_gateway, s1), rt->rt_metric);
-	log(LOG_DEBUG, 0, "rt origin %s",
+	logit(LOG_DEBUG, 0, "rt origin %s",
 		inet_fmts(rt->rt_origin, rt->rt_originmask, s1));
     } else
-	log(LOG_DEBUG, 0, "...no route");
+	logit(LOG_DEBUG, 0, "...no route");
 
     /*
      * Query type packet - check if rte exists
@@ -2023,12 +2023,12 @@ accept_mtrace(u_int32_t src, u_int32_t dst, u_int32_t group,
 	     * only get N copies, N <= the number of interfaces on the router,
 	     * it is not fatal.
 	     */
-	    log(LOG_DEBUG, 0, "ignoring duplicate traceroute packet");
+	    logit(LOG_DEBUG, 0, "ignoring duplicate traceroute packet");
 	    return;
 	}
 
 	if (rt == NULL) {
-	    log(LOG_DEBUG, 0, "Mcast traceroute: no route entry %s",
+	    logit(LOG_DEBUG, 0, "Mcast traceroute: no route entry %s",
 		   inet_fmt(qry->tr_src, s1));
 	    if (IN_MULTICAST(ntohl(dst)))
 		return;
@@ -2037,13 +2037,13 @@ accept_mtrace(u_int32_t src, u_int32_t dst, u_int32_t group,
 
 	if (vifi == NO_VIF) {
 	    /* The traceroute destination is not on one of my subnet vifs. */
-	    log(LOG_DEBUG, 0, "Destination %s not an interface",
+	    logit(LOG_DEBUG, 0, "Destination %s not an interface",
 		   inet_fmt(qry->tr_dst, s1));
 	    if (IN_MULTICAST(ntohl(dst)))
 		return;
 	    errcode = TR_WRONG_IF;
 	} else if (rt != NULL && !VIFM_ISSET(vifi, rt->rt_children)) {
-	    log(LOG_DEBUG, 0, "Destination %s not on forwarding tree for src %s",
+	    logit(LOG_DEBUG, 0, "Destination %s not on forwarding tree for src %s",
 		   inet_fmt(qry->tr_dst, s1), inet_fmt(qry->tr_src, s2));
 	    if (IN_MULTICAST(ntohl(dst)))
 		return;
@@ -2057,7 +2057,7 @@ accept_mtrace(u_int32_t src, u_int32_t dst, u_int32_t group,
 	 * a tunnel or came from a directly attached mrouter.
 	 */
 	if ((vifi = find_vif(src, dst)) == NO_VIF) {
-	    log(LOG_DEBUG, 0, "Wrong interface for packet");
+	    logit(LOG_DEBUG, 0, "Wrong interface for packet");
 	    errcode = TR_WRONG_IF;
 	}
     }
@@ -2065,7 +2065,7 @@ accept_mtrace(u_int32_t src, u_int32_t dst, u_int32_t group,
     /* Now that we've decided to send a response, save the qid */
     oqid = qry->tr_qid;
 
-    log(LOG_DEBUG, 0, "Sending traceroute response");
+    logit(LOG_DEBUG, 0, "Sending traceroute response");
 
     /* copy the packet to the sending buffer */
     p = send_buf + MIN_IP_HEADER_LEN + IGMP_MINLEN;
@@ -2165,7 +2165,7 @@ accept_mtrace(u_int32_t src, u_int32_t dst, u_int32_t group,
 	resp->tr_inaddr = src;
 	resp->tr_rmtaddr = rt->rt_gateway;
 	if (!VIFM_ISSET(vifi, rt->rt_children)) {
-	    log(LOG_DEBUG, 0, "Destination %s not on forwarding tree for src %s",
+	    logit(LOG_DEBUG, 0, "Destination %s not on forwarding tree for src %s",
 		   inet_fmt(qry->tr_dst, s1), inet_fmt(qry->tr_src, s2));
 	    resp->tr_rflags = TR_WRONG_IF;
 	}
@@ -2182,7 +2182,7 @@ sendit:
      * else send to upstream router.  If the upstream router can't handle
      * mtrace, set an error code and send to requestor anyway.
      */
-    log(LOG_DEBUG, 0, "rcount:%d, no:%d", rcount, no);
+    logit(LOG_DEBUG, 0, "rcount:%d, no:%d", rcount, no);
 
     if ((rcount + 1 == no) || (rt == NULL) || (rt->rt_metric == 1)) {
 	resptype = IGMP_MTRACE_REPLY;
@@ -2203,7 +2203,7 @@ sendit:
 	 * If we don't have one, we can't source any multicasts anyway.
 	 */
 	if (phys_vif != -1) {
-	    log(LOG_DEBUG, 0, "Sending reply to %s from %s",
+	    logit(LOG_DEBUG, 0, "Sending reply to %s from %s",
 		inet_fmt(dst, s1), inet_fmt(uvifs[phys_vif].uv_lcl_addr, s2));
 	    k_set_ttl(qry->tr_rttl);
 	    send_igmp(uvifs[phys_vif].uv_lcl_addr, dst,
@@ -2211,10 +2211,10 @@ sendit:
 		      datalen);
 	    k_set_ttl(1);
 	} else
-	    log(LOG_INFO, 0, "No enabled phyints -- %s",
+	    logit(LOG_INFO, 0, "No enabled phyints -- %s",
 			"dropping traceroute reply");
     } else {
-	log(LOG_DEBUG, 0, "Sending %s to %s from %s",
+	logit(LOG_DEBUG, 0, "Sending %s to %s from %s",
 	    resptype == IGMP_MTRACE_REPLY ?  "reply" : "request on",
 	    inet_fmt(dst, s1), inet_fmt(src, s2));
 
diff --git a/usr.sbin/mrouted/route.c b/usr.sbin/mrouted/route.c
index eb5c74ce404..dca24f82ffe 100644
--- a/usr.sbin/mrouted/route.c
+++ b/usr.sbin/mrouted/route.c
@@ -286,7 +286,7 @@ create_route(u_int32_t origin, u_int32_t mask)
     if ((r = (struct rtentry *) malloc(sizeof(struct rtentry) +
 				       (2 * numvifs * sizeof(u_int32_t)) +
 				       (numvifs * sizeof(u_int)))) == NULL) {
-	log(LOG_ERR, 0, "ran out of memory");	/* fatal */
+	logit(LOG_ERR, 0, "ran out of memory");	/* fatal */
     }
     r->rt_origin     = origin;
     r->rt_originmask = mask;
@@ -350,7 +350,7 @@ update_route(u_int32_t origin, u_int32_t mask, u_int metric, u_int32_t src,
      * all unreachable/poisoned metrics into a single value.
      */
     if (src != 0 && (metric < 1 || metric >= 2*UNREACHABLE)) {
-	log(LOG_WARNING, 0,
+	logit(LOG_WARNING, 0,
 	    "%s reports out-of-range metric %u for origin %s",
 	    inet_fmt(src, s1), metric, inet_fmts(origin, mask, s2));
 	return;
@@ -371,7 +371,7 @@ update_route(u_int32_t origin, u_int32_t mask, u_int metric, u_int32_t src,
 	    return;
 	}
 	if (src != 0 && !inet_valid_subnet(origin, mask)) {
-	    log(LOG_WARNING, 0,
+	    logit(LOG_WARNING, 0,
 		"%s reports an invalid origin (%s) and/or mask (%08x)",
 		inet_fmt(src, s1), inet_fmt(origin, s2), ntohl(mask));
 	    return;
@@ -686,7 +686,7 @@ accept_probe(u_int32_t src, u_int32_t dst, char *p, int datalen,
     vifi_t vifi;
 
     if ((vifi = find_vif(src, dst)) == NO_VIF) {
-	log(LOG_INFO, 0,
+	logit(LOG_INFO, 0,
 	    "ignoring probe from non-neighbor %s", inet_fmt(src, s1));
 	return;
     }
@@ -740,7 +740,7 @@ accept_report(u_int32_t src, u_int32_t dst, char *p, int datalen,
     struct newrt rt[4096];
 
     if ((vifi = find_vif(src, dst)) == NO_VIF) {
-	log(LOG_INFO, 0,
+	logit(LOG_INFO, 0,
 	    "ignoring route report from non-neighbor %s", inet_fmt(src, s1));
 	return;
     }
@@ -749,7 +749,7 @@ accept_report(u_int32_t src, u_int32_t dst, char *p, int datalen,
 	return;
 
     if (datalen > 2*4096) {
-	log(LOG_INFO, 0,
+	logit(LOG_INFO, 0,
 	    "ignoring oversize (%d bytes) route report from %s",
 	    datalen, inet_fmt(src, s1));
 	return;
@@ -758,7 +758,7 @@ accept_report(u_int32_t src, u_int32_t dst, char *p, int datalen,
     while (datalen > 0) {	/* Loop through per-mask lists. */
 
 	if (datalen < 3) {
-	    log(LOG_WARNING, 0,
+	    logit(LOG_WARNING, 0,
 		"received truncated route report from %s",
 		inet_fmt(src, s1));
 	    return;
@@ -768,7 +768,7 @@ accept_report(u_int32_t src, u_int32_t dst, char *p, int datalen,
 	if ((((u_char *)&mask)[2] = *p++) != 0) width = 3;
 	if ((((u_char *)&mask)[3] = *p++) != 0) width = 4;
 	if (!inet_valid_mask(ntohl(mask))) {
-	    log(LOG_WARNING, 0,
+	    logit(LOG_WARNING, 0,
 		"%s reports bogus netmask 0x%08x (%s)",
 		inet_fmt(src, s1), ntohl(mask), inet_fmt(mask, s2));
 	    return;
@@ -777,7 +777,7 @@ accept_report(u_int32_t src, u_int32_t dst, char *p, int datalen,
 
 	do {			/* Loop through (origin, metric) pairs */
 	    if (datalen < width + 1) {
-		log(LOG_WARNING, 0,
+		logit(LOG_WARNING, 0,
 		    "received truncated route report from %s",
 		    inet_fmt(src, s1));
 		return;
@@ -802,12 +802,12 @@ accept_report(u_int32_t src, u_int32_t dst, char *p, int datalen,
     if (rt[nrt-1].origin == 0)
 	rt[nrt-1].mask = 0;
 
-    log(LOG_DEBUG, 0, "Updating %d routes from %s to %s", nrt,
+    logit(LOG_DEBUG, 0, "Updating %d routes from %s to %s", nrt,
 		inet_fmt(src, s1), inet_fmt(dst, s2));
     for (i = 0; i < nrt; ++i) {
 	if (i != 0 && rt[i].origin == rt[i-1].origin &&
 		      rt[i].mask == rt[i-1].mask) {
-	    log(LOG_WARNING, 0, "%s reports duplicate route for %s",
+	    logit(LOG_WARNING, 0, "%s reports duplicate route for %s",
 		inet_fmt(src, s1), inet_fmts(rt[i].origin, rt[i].mask, s2));
 	    continue;
 	}
@@ -1071,7 +1071,7 @@ report_next_chunk(void)
 	min = 0;	/* Neighborless router didn't send any routes */
 
     n = min;
-    log(LOG_INFO, 0, "update %d starting at %d of %d",
+    logit(LOG_INFO, 0, "update %d starting at %d of %d",
 	n, (nroutes - start_rt), nroutes);
 
     start_rt = (start_rt + n) % nroutes;
diff --git a/usr.sbin/mrouted/rsrr.c b/usr.sbin/mrouted/rsrr.c
index 22c0f2ed94f..a8cca19e894 100644
--- a/usr.sbin/mrouted/rsrr.c
+++ b/usr.sbin/mrouted/rsrr.c
@@ -89,7 +89,7 @@ rsrr_init()
     struct sockaddr_un serv_addr;
 
     if ((rsrr_socket = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0)
-	log(LOG_ERR, errno, "Can't create RSRR socket");
+	logit(LOG_ERR, errno, "Can't create RSRR socket");
 
     unlink(RSRR_SERV_PATH);
     bzero((char *) &serv_addr, sizeof(serv_addr));
@@ -104,10 +104,10 @@ rsrr_init()
 #endif
 
     if (bind(rsrr_socket, (struct sockaddr *) &serv_addr, servlen) < 0)
-	log(LOG_ERR, errno, "Can't bind RSRR socket");
+	logit(LOG_ERR, errno, "Can't bind RSRR socket");
 
     if (register_input_handler(rsrr_socket,rsrr_read) < 0)
-	log(LOG_WARNING, 0, "Couldn't register RSRR as an input handler");
+	logit(LOG_WARNING, 0, "Couldn't register RSRR as an input handler");
 }
 
 /* Read a message from the RSRR socket */
@@ -124,7 +124,7 @@ rsrr_read(f, rfd)
 			    0, (struct sockaddr *)&client_addr, &client_length);
     if (rsrr_recvlen < 0) {
 	if (errno != EINTR)
-	    log(LOG_ERR, errno, "RSRR recvfrom");
+	    logit(LOG_ERR, errno, "RSRR recvfrom");
 	return;
     }
     /* Use of omask taken from main() */
@@ -146,7 +146,7 @@ rsrr_accept(recvlen)
     struct rsrr_rq *route_query;
 
     if (recvlen < RSRR_HEADER_LEN) {
-	log(LOG_WARNING, 0,
+	logit(LOG_WARNING, 0,
 	    "Received RSRR packet of %d bytes, which is less than min size",
 	    recvlen);
 	return;
@@ -155,7 +155,7 @@ rsrr_accept(recvlen)
     rsrr = (struct rsrr_header *) rsrr_recv_buf;
 
     if (rsrr->version > RSRR_MAX_VERSION) {
-	log(LOG_WARNING, 0,
+	logit(LOG_WARNING, 0,
 	    "Received RSRR packet version %d, which I don't understand",
 	    rsrr->version);
 	return;
@@ -166,20 +166,20 @@ rsrr_accept(recvlen)
 	switch (rsrr->type) {
 	  case RSRR_INITIAL_QUERY:
 	    /* Send Initial Reply to client */
-	    log(LOG_INFO, 0, "Received Initial Query\n");
+	    logit(LOG_INFO, 0, "Received Initial Query\n");
 	    rsrr_accept_iq();
 	    break;
 	  case RSRR_ROUTE_QUERY:
 	    /* Check size */
 	    if (recvlen < RSRR_RQ_LEN) {
-		log(LOG_WARNING, 0,
+		logit(LOG_WARNING, 0,
 		    "Received Route Query of %d bytes, which is too small",
 		    recvlen);
 		break;
 	    }
 	    /* Get the query */
 	    route_query = (struct rsrr_rq *) (rsrr_recv_buf + RSRR_HEADER_LEN);
-	    log(LOG_INFO, 0,
+	    logit(LOG_INFO, 0,
 		"Received Route Query for src %s grp %s notification %d",
 		inet_fmt(route_query->source_addr.s_addr, s1),
 		inet_fmt(route_query->dest_addr.s_addr,s2),
@@ -188,7 +188,7 @@ rsrr_accept(recvlen)
 	    rsrr_accept_rq(route_query,rsrr->flags,NULL);
 	    break;
 	  default:
-	    log(LOG_WARNING, 0,
+	    logit(LOG_WARNING, 0,
 		"Received RSRR packet type %d, which I don't handle",
 		rsrr->type);
 	    break;
@@ -196,7 +196,7 @@ rsrr_accept(recvlen)
 	break;
 
       default:
-	log(LOG_WARNING, 0,
+	logit(LOG_WARNING, 0,
 	    "Received RSRR packet version %d, which I don't understand",
 	    rsrr->version);
 	break;
@@ -216,7 +216,7 @@ rsrr_accept_iq()
      * but we should check anyway.
      */
     if (numvifs > RSRR_MAX_VIFS) {
-	log(LOG_WARNING, 0,
+	logit(LOG_WARNING, 0,
 	    "Can't send RSRR Route Reply because %d is too many vifs %d",
 	    numvifs);
 	return;
@@ -245,7 +245,7 @@ rsrr_accept_iq()
     sendlen = RSRR_HEADER_LEN + numvifs*RSRR_VIF_LEN;
 
     /* Send it. */
-    log(LOG_INFO, 0, "Send RSRR Initial Reply");
+    logit(LOG_INFO, 0, "Send RSRR Initial Reply");
     rsrr_send(sendlen);
 }
 
@@ -361,12 +361,12 @@ rsrr_accept_rq(route_query,flags,gt_notify)
     }
 
     if (gt_notify)
-	log(LOG_INFO, 0, "Route Change: Send RSRR Route Reply");
+	logit(LOG_INFO, 0, "Route Change: Send RSRR Route Reply");
 
     else
-	log(LOG_INFO, 0, "Send RSRR Route Reply");
+	logit(LOG_INFO, 0, "Send RSRR Route Reply");
 
-    log(LOG_INFO, 0, "for src %s dst %s in vif %d out vif %d\n",
+    logit(LOG_INFO, 0, "for src %s dst %s in vif %d out vif %d\n",
 	inet_fmt(route_reply->source_addr.s_addr,s1),
 	inet_fmt(route_reply->dest_addr.s_addr,s2),
 	route_reply->in_vif,route_reply->out_vif_bm);
@@ -388,9 +388,9 @@ rsrr_send(sendlen)
 
     /* Check for errors. */
     if (error < 0) {
-	log(LOG_WARNING, errno, "Failed send on RSRR socket");
+	logit(LOG_WARNING, errno, "Failed send on RSRR socket");
     } else if (error != sendlen) {
-	log(LOG_WARNING, 0,
+	logit(LOG_WARNING, 0,
 	    "Sent only %d out of %d bytes on RSRR socket\n", error, sendlen);
     }
     return error;
@@ -426,7 +426,7 @@ rsrr_cache(gt,route_query)
 	    } else {
 		/* Update */
 		rc->route_query.query_id = route_query->query_id;
-		log(LOG_DEBUG, 0,
+		logit(LOG_DEBUG, 0,
 			"Update cached query id %ld from client %s\n",
 			rc->route_query.query_id, rc->client_addr.sun_path);
 	    }
@@ -440,7 +440,7 @@ rsrr_cache(gt,route_query)
      */
     rc = (struct rsrr_cache *) malloc(sizeof(struct rsrr_cache));
     if (rc == NULL)
-	log(LOG_ERR, 0, "ran out of memory");
+	logit(LOG_ERR, 0, "ran out of memory");
     rc->route_query.source_addr.s_addr = route_query->source_addr.s_addr;
     rc->route_query.dest_addr.s_addr = route_query->dest_addr.s_addr;
     rc->route_query.query_id = route_query->query_id;
@@ -449,7 +449,7 @@ rsrr_cache(gt,route_query)
     rc->client_length = client_length;
     rc->next = gt->gt_rsrr_cache;
     gt->gt_rsrr_cache = rc;
-    log(LOG_DEBUG, 0, "Cached query id %ld from client %s\n",
+    logit(LOG_DEBUG, 0, "Cached query id %ld from client %s\n",
 	   rc->route_query.query_id,rc->client_addr.sun_path);
 }
 
@@ -470,7 +470,7 @@ rsrr_cache_send(gt,notify)
     rcnp = &gt->gt_rsrr_cache;
     while ((rc = *rcnp) != NULL) {
 	if (rsrr_accept_rq(&rc->route_query,flags,gt) < 0) {
-	    log(LOG_DEBUG, 0, "Deleting cached query id %ld from client %s\n",
+	    logit(LOG_DEBUG, 0, "Deleting cached query id %ld from client %s\n",
 		   rc->route_query.query_id,rc->client_addr.sun_path);
 	    /* Delete cache entry. */
 	    *rcnp = rc->next;
diff --git a/usr.sbin/mrouted/vif.c b/usr.sbin/mrouted/vif.c
index 3a9d9a20c09..af0934e41b8 100644
--- a/usr.sbin/mrouted/vif.c
+++ b/usr.sbin/mrouted/vif.c
@@ -72,10 +72,10 @@ init_vifs(void)
      * (Open a UDP socket for ioctl use in the config procedures.)
      */
     if ((udp_socket = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
-	log(LOG_ERR, errno, "UDP socket");
-    log(LOG_INFO,0,"Getting vifs from kernel interfaces");
+	logit(LOG_ERR, errno, "UDP socket");
+    logit(LOG_INFO,0,"Getting vifs from kernel interfaces");
     config_vifs_from_kernel();
-    log(LOG_INFO,0,"Getting vifs from %s",configfilename);
+    logit(LOG_INFO,0,"Getting vifs from %s",configfilename);
     config_vifs_from_file();
 
     /*
@@ -95,26 +95,26 @@ init_vifs(void)
 	}
     }
     if (enabled_vifs < 2)
-	log(LOG_ERR, 0, "can't forward: %s",
+	logit(LOG_ERR, 0, "can't forward: %s",
 	    enabled_vifs == 0 ? "no enabled vifs" : "only one enabled vif");
 
     if (enabled_phyints == 0)
-	log(LOG_WARNING, 0,
+	logit(LOG_WARNING, 0,
 	    "no enabled interfaces, forwarding via tunnels only");
 
-    log(LOG_INFO, 0, "Installing vifs in mrouted...");
+    logit(LOG_INFO, 0, "Installing vifs in mrouted...");
     for (vifi = 0, v = uvifs; vifi < numvifs; ++vifi, ++v) {
 	if (!(v->uv_flags & VIFF_DISABLED)) {
 	    if (!(v->uv_flags & VIFF_DOWN)) {
 		if (v->uv_flags & VIFF_TUNNEL)
-		    log(LOG_INFO, 0, "vif #%d, tunnel %s -> %s", vifi,
+		    logit(LOG_INFO, 0, "vif #%d, tunnel %s -> %s", vifi,
 				inet_fmt(v->uv_lcl_addr, s1),
 				inet_fmt(v->uv_rmt_addr, s2));
 		else
-		    log(LOG_INFO, 0, "vif #%d, phyint %s", vifi,
+		    logit(LOG_INFO, 0, "vif #%d, phyint %s", vifi,
 				inet_fmt(v->uv_lcl_addr, s1));
 		start_vif2(vifi);
-	    } else log(LOG_INFO, 0,
+	    } else logit(LOG_INFO, 0,
 		     "%s is not yet up; vif #%u not in service",
 		     v->uv_name, vifi);
 	}
@@ -131,19 +131,19 @@ init_installvifs(void)
     vifi_t vifi;
     struct uvif *v;
 
-    log(LOG_INFO, 0, "Installing vifs in kernel...");
+    logit(LOG_INFO, 0, "Installing vifs in kernel...");
     for (vifi = 0, v = uvifs; vifi < numvifs; ++vifi, ++v) {
 	if (!(v->uv_flags & VIFF_DISABLED)) {
 	    if (!(v->uv_flags & VIFF_DOWN)) {
 		if (v->uv_flags & VIFF_TUNNEL)
-		    log(LOG_INFO, 0, "vif #%d, tunnel %s -> %s", vifi,
+		    logit(LOG_INFO, 0, "vif #%d, tunnel %s -> %s", vifi,
 				inet_fmt(v->uv_lcl_addr, s1),
 				inet_fmt(v->uv_rmt_addr, s2));
 		else
-		    log(LOG_INFO, 0, "vif #%d, phyint %s", vifi,
+		    logit(LOG_INFO, 0, "vif #%d, phyint %s", vifi,
 				inet_fmt(v->uv_lcl_addr, s1));
 		k_add_vif(vifi, &uvifs[vifi]);
-	    } else log(LOG_INFO, 0,
+	    } else logit(LOG_INFO, 0,
 		     "%s is not yet up; vif #%u not in service",
 		     v->uv_name, vifi);
 	}
@@ -170,14 +170,14 @@ check_vif_state(void)
 
 	strncpy(ifr.ifr_name, v->uv_name, IFNAMSIZ);
 	if (ioctl(udp_socket, SIOCGIFFLAGS, (char *)&ifr) < 0)
-	    log(LOG_ERR, errno,
+	    logit(LOG_ERR, errno,
 		"ioctl SIOCGIFFLAGS for %s", ifr.ifr_name);
 
 	if (v->uv_flags & VIFF_DOWN) {
 	    if (ifr.ifr_flags & IFF_UP) {
 		v->uv_flags &= ~VIFF_DOWN;
 		start_vif(vifi);
-		log(LOG_INFO, 0,
+		logit(LOG_INFO, 0,
 		    "%s has come up; vif #%u now in service",
 		    v->uv_name, vifi);
 	    }
@@ -187,7 +187,7 @@ check_vif_state(void)
 	    if (!(ifr.ifr_flags & IFF_UP)) {
 		stop_vif(vifi);
 		v->uv_flags |= VIFF_DOWN;
-		log(LOG_INFO, 0,
+		logit(LOG_INFO, 0,
 		    "%s has gone down; vif #%u taken out of service",
 		    v->uv_name, vifi);
 		vifs_down = TRUE;
@@ -503,7 +503,7 @@ accept_membership_query(u_int32_t src, u_int32_t dst, u_int32_t group,
 
     if ((vifi = find_vif(src, dst)) == NO_VIF ||
 	(uvifs[vifi].uv_flags & VIFF_TUNNEL)) {
-	log(LOG_INFO, 0,
+	logit(LOG_INFO, 0,
 	    "ignoring group membership query from non-adjacent host %s",
 	    inet_fmt(src, s1));
 	return;
@@ -541,7 +541,7 @@ accept_group_report(u_int32_t src, u_int32_t dst, u_int32_t group,
 
     if ((vifi = find_vif(src, dst)) == NO_VIF ||
 	(uvifs[vifi].uv_flags & VIFF_TUNNEL)) {
-	log(LOG_INFO, 0,
+	logit(LOG_INFO, 0,
 	    "ignoring group membership report from non-adjacent host %s",
 	    inet_fmt(src, s1));
 	return;
@@ -577,7 +577,7 @@ accept_group_report(u_int32_t src, u_int32_t dst, u_int32_t group,
     if (g == NULL) {
 	g = (struct listaddr *)malloc(sizeof(struct listaddr));
 	if (g == NULL)
-	    log(LOG_ERR, 0, "ran out of memory");    /* fatal */
+	    logit(LOG_ERR, 0, "ran out of memory");    /* fatal */
 
 	g->al_addr   = group;
 	if (r_type == IGMP_v2_HOST_MEMBERSHIP_REPORT)
@@ -615,7 +615,7 @@ accept_leave_message(u_int32_t src, u_int32_t dst, u_int32_t group)
 
     if ((vifi = find_vif(src, dst)) == NO_VIF ||
 	(uvifs[vifi].uv_flags & VIFF_TUNNEL)) {
-	log(LOG_INFO, 0,
+	logit(LOG_INFO, 0,
 	    "ignoring group leave report from non-adjacent host %s",
 	    inet_fmt(src, s1));
 	return;
@@ -632,7 +632,7 @@ accept_leave_message(u_int32_t src, u_int32_t dst, u_int32_t group)
      */
     for (g = v->uv_groups; g != NULL; g = g->al_next) {
 	if (group == g->al_addr) {
-	    log(LOG_DEBUG, 0,
+	    logit(LOG_DEBUG, 0,
 		"[vif.c, _accept_leave_message] %d %d \n",
 		g->al_old, g->al_query);
 
@@ -713,7 +713,7 @@ accept_neighbor_request(u_int32_t src, u_int32_t dst)
 	if ((udp = socket(AF_INET, SOCK_DGRAM, 0)) < 0
 	    || connect(udp, (struct sockaddr *) &addr, sizeof(addr)) < 0
 	    || getsockname(udp, (struct sockaddr *) &addr, &addrlen) < 0) {
-	    log(LOG_WARNING, errno, "Determining local address");
+	    logit(LOG_WARNING, errno, "Determining local address");
 	    close(udp);
 	    return;
 	}
@@ -800,7 +800,7 @@ accept_neighbor_request2(u_int32_t src, u_int32_t dst)
 	if ((udp = socket(AF_INET, SOCK_DGRAM, 0)) < 0
 	    || connect(udp, (struct sockaddr *) &addr, sizeof(addr)) < 0
 	    || getsockname(udp, (struct sockaddr *) &addr, &addrlen) < 0) {
-	    log(LOG_WARNING, errno, "Determining local address");
+	    logit(LOG_WARNING, errno, "Determining local address");
 	    close(udp);
 	    return;
 	}
@@ -908,7 +908,7 @@ accept_info_request(u_int32_t src, u_int32_t dst, u_char *p, int datalen)
 
 	    case DVMRP_INFO_NEIGHBORS:
 	    default:
-		log(LOG_INFO, 0, "ignoring unknown info type %d", *p);
+		logit(LOG_INFO, 0, "ignoring unknown info type %d", *p);
 		break;
 	}
 	*(q+1) = len++;
@@ -951,7 +951,7 @@ void
 accept_neighbors(u_int32_t src, u_int32_t dst, u_char *p, int datalen,
     u_int32_t level)
 {
-    log(LOG_INFO, 0, "ignoring spurious DVMRP neighbor list from %s to %s",
+    logit(LOG_INFO, 0, "ignoring spurious DVMRP neighbor list from %s to %s",
 	inet_fmt(src, s1), inet_fmt(dst, s2));
 }
 
@@ -963,7 +963,7 @@ void
 accept_neighbors2(u_int32_t src, u_int32_t dst, u_char *p, int datalen,
     u_int32_t level)
 {
-    log(LOG_INFO, 0, "ignoring spurious DVMRP neighbor list2 from %s to %s",
+    logit(LOG_INFO, 0, "ignoring spurious DVMRP neighbor list2 from %s to %s",
 	inet_fmt(src, s1), inet_fmt(dst, s2));
 }
 
@@ -973,7 +973,7 @@ accept_neighbors2(u_int32_t src, u_int32_t dst, u_char *p, int datalen,
 void
 accept_info_reply(u_int32_t src, u_int32_t dst, u_char *p, int datalen)
 {
-    log(LOG_INFO, 0, "ignoring spurious DVMRP info reply from %s to %s",
+    logit(LOG_INFO, 0, "ignoring spurious DVMRP info reply from %s to %s",
 	inet_fmt(src, s1), inet_fmt(dst, s2));
 }
 
@@ -1012,7 +1012,7 @@ update_neighbor(vifi_t vifi, u_int32_t addr, int msgtype, char *p,
     if (!(v->uv_flags & VIFF_TUNNEL) &&
 	(addr == v->uv_lcl_addr ||
 	 addr == v->uv_subnet )) {
-	log(LOG_WARNING, 0,
+	logit(LOG_WARNING, 0,
 	    "received DVMRP message from 'the unknown host' or self: %s",
 	    inet_fmt(addr, s1));
 	return (FALSE);
@@ -1042,7 +1042,7 @@ update_neighbor(vifi_t vifi, u_int32_t addr, int msgtype, char *p,
 	    (n->al_mv != ((level >> 8) & 0xff))) {
 
 	    do_reset = TRUE;
-	    log(LOG_DEBUG, 0,
+	    logit(LOG_DEBUG, 0,
 		"version change neighbor %s [old:%d.%d, new:%d.%d]",
 		inet_fmt(addr, s1),
 		n->al_pv, n->al_mv, level&0xff, (level >> 8) & 0xff);
@@ -1055,13 +1055,13 @@ update_neighbor(vifi_t vifi, u_int32_t addr, int msgtype, char *p,
 	 * If not found, add it to the list.  If the neighbor has a lower
 	 * IP address than me, yield querier duties to it.
 	 */
-	log(LOG_DEBUG, 0, "New neighbor %s on vif %d v%d.%d nf 0x%02x",
+	logit(LOG_DEBUG, 0, "New neighbor %s on vif %d v%d.%d nf 0x%02x",
 	    inet_fmt(addr, s1), vifi, level & 0xff, (level >> 8) & 0xff,
 	    (level >> 16) & 0xff);
 
 	n = (struct listaddr *)malloc(sizeof(struct listaddr));
 	if (n == NULL)
-	    log(LOG_ERR, 0, "ran out of memory");    /* fatal */
+	    logit(LOG_ERR, 0, "ran out of memory");    /* fatal */
 
 	n->al_addr      = addr;
 	n->al_pv	= level & 0xff;
@@ -1107,7 +1107,7 @@ update_neighbor(vifi_t vifi, u_int32_t addr, int msgtype, char *p,
 	    int i;
 
 	    if (datalen < 4) {
-		log(LOG_WARNING, 0,
+		logit(LOG_WARNING, 0,
 		    "received truncated probe message from %s (len %d)",
 		    inet_fmt(addr, s1), datalen);
 		return (FALSE);
@@ -1120,7 +1120,7 @@ update_neighbor(vifi_t vifi, u_int32_t addr, int msgtype, char *p,
 	    if (n->al_genid == 0)
 		n->al_genid = genid;
 	    else if (n->al_genid != genid) {
-		log(LOG_DEBUG, 0,
+		logit(LOG_DEBUG, 0,
 		    "new genid neigbor %s on vif %d [old:%x, new:%x]",
 		    inet_fmt(addr, s1), vifi, n->al_genid, genid);
 
@@ -1136,7 +1136,7 @@ update_neighbor(vifi_t vifi, u_int32_t addr, int msgtype, char *p,
 
 	    while (datalen > 0) {
 		if (datalen < 4) {
-		    log(LOG_WARNING, 0,
+		    logit(LOG_WARNING, 0,
 			"received truncated probe message from %s (len %d)",
 			inet_fmt(addr, s1), datalen);
 		    return (FALSE);
@@ -1343,7 +1343,7 @@ dump_vifs(FILE *fp)
 	}
 	v_req.vifi = vifi;
 	if (ioctl(udp_socket, SIOCGETVIFCNT, (char *)&v_req) < 0) {
-	    log(LOG_WARNING, 0,
+	    logit(LOG_WARNING, 0,
 		"SIOCGETVIFCNT fails");
 	}
 	else {
diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c
index f5f0dbfc6ed..57264be50af 100644
--- a/usr.sbin/mtrace/mtrace.c
+++ b/usr.sbin/mtrace/mtrace.c
@@ -52,7 +52,7 @@
 
 #ifndef lint
 static char rcsid[] =
-    "@(#) $Id: mtrace.c,v 1.20 2003/09/23 09:19:18 matthieu Exp $";
+    "@(#) $Id: mtrace.c,v 1.21 2003/11/26 01:17:12 millert Exp $";
 #endif
 
 #include <netdb.h>
@@ -1660,7 +1660,7 @@ or multicast at ttl %d doesn't reach its last-hop router for that source\n",
 void
 check_vif_state()
 {
-    log(LOG_WARNING, errno, "sendto");
+    logit(LOG_WARNING, errno, "sendto");
 }
 
 /*
@@ -1669,7 +1669,7 @@ check_vif_state()
  * LOG_ERR or worse, terminate the program.
  */
 void
-log(int severity, int syserr, char *format, ...)
+logit(int severity, int syserr, char *format, ...)
 {
     va_list ap;