Push removal of mrouted down to the rest of the tree.

11 files changed, 23 insertions, 18 deletions

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 925b5ff..3b2589f 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -297,7 +297,11 @@ gateway_enable="NO"		# Set to YES if this host will be a gateway.
 router_enable="NO"		# Set to YES to enable a routing daemon.
 router="/sbin/routed"		# Name of routing daemon to use if enabled.
 router_flags="-q"		# Flags for routing daemon.
-mrouted_enable="NO"		# Do multicast routing (see /etc/mrouted.conf).
+mrouted_enable="NO"		# Do IPv4 multicast routing.
+mrouted_program="/usr/local/sbin/mrouted"	# Name of IPv4 multicast
+						# routing daemon.  You need to
+						# install it from package or
+						# port.
 mrouted_flags=""		# Flags for multicast routing daemon.
 ipxgateway_enable="NO"		# Set to YES to enable IPX routing.
 ipxrouted_enable="NO"		# Set to YES to run the IPX routing daemon.
diff --git a/etc/rc.d/mrouted b/etc/rc.d/mrouted
index 79e3693..4c741f8 100755
--- a/etc/rc.d/mrouted
+++ b/etc/rc.d/mrouted
@@ -12,7 +12,7 @@
 
 name="mrouted"
 rcvar=`set_rcvar`
-command="/usr/sbin/${name}"
+command="/usr/local/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/etc/${name}.conf"
 extra_commands="reload"
diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4
index 174e45f..7ed9819 100644
--- a/share/man/man4/ip6.4
+++ b/share/man/man4/ip6.4
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 29, 2004
+.Dd September 29, 2006
 .Dt IP6 4
 .Os
 .Sh NAME
@@ -178,8 +178,7 @@ any network but may be delivered locally if the sending host belongs to
 the destination group and if multicast loopback (see below) has not been
 disabled on the sending socket.
 Multicast datagrams with a hop limit greater than 1 may be forwarded to
-the other networks if a multicast router (such as
-.Xr mrouted 8 )
+the other networks if a multicast router (such as mrouted)
 is attached to the local network.
 .It Dv IPV6_MULTICAST_LOOP Fa "u_int *"
 Get or set the status of whether multicast datagrams will be looped back
diff --git a/share/man/man4/man4.i386/wl.4 b/share/man/man4/man4.i386/wl.4
index b0d1331..80e6dc1 100644
--- a/share/man/man4/man4.i386/wl.4
+++ b/share/man/man4/man4.i386/wl.4
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd July 7, 1997
+.Dd September 29, 2006
 .Dt WL 4 i386
 .Os
 .Sh NAME
@@ -146,8 +146,7 @@ The 82586 has numerous defects.
 It may experience transmit-side
 errors when modern faster cpus send packets at it faster than it can handle.
 The driver (and probably the chip) does not support an all multicast mode.
-As a result, it can be used with applications like
-.Xr mrouted 8 ,
+As a result, it can be used with applications like mrouted,
 but it must go into promiscuous mode for that to work.
 The driver
 is slow to change modes from "normal" to promiscuous mode, presumably
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 7e38ff5..eea9180 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 17, 2006
+.Dd September 29, 2006
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -2089,11 +2089,14 @@ The IPv6 equivalent of
 If set to
 .Dq Li YES ,
 run the IPv6 multicast routing daemon.
-Note that no IPv6 multicast routing daemon is included in the
+.Pp
+Note that multicast routing daemons are no longer included in the
 .Fx
-base system but
+base system, however, both
+.Xr mrouted 8
+and
 .Xr pim6dd 8
-can be installed from the
+may be installed from the
 .Fx
 Ports Collection.
 .It Va mrouted_flags
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 5f5fb2f..125a486 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -1429,7 +1429,7 @@ del_mfc(struct mfcctl2 *mfccp)
 }
 
 /*
- * Send a message to mrouted on the multicast routing socket
+ * Send a message to the routing daemon on the multicast routing socket
  */
 static int
 socket_send(struct socket *s, struct mbuf *mm, struct sockaddr_in *src)
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index 2b8a48d..134a06b 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -211,7 +211,7 @@ struct bw_upcall {
 struct mrtstat {
     u_long	mrts_mfc_lookups;	/* # forw. cache hash table hits   */
     u_long	mrts_mfc_misses;	/* # forw. cache hash table misses */
-    u_long	mrts_upcalls;		/* # calls to mrouted              */
+    u_long	mrts_upcalls;		/* # calls to routing daemon       */
     u_long	mrts_no_route;		/* no route for packet's origin    */
     u_long	mrts_bad_tunnel;	/* malformed tunnel options        */
     u_long	mrts_cant_tunnel;	/* no room for tunnel options      */
diff --git a/sys/netinet6/ip6_mroute.h b/sys/netinet6/ip6_mroute.h
index 26ac008..6ed7c35 100644
--- a/sys/netinet6/ip6_mroute.h
+++ b/sys/netinet6/ip6_mroute.h
@@ -126,7 +126,7 @@ struct mf6cctl {
 struct mrt6stat {
 	u_quad_t mrt6s_mfc_lookups;	/* # forw. cache hash table hits   */
 	u_quad_t mrt6s_mfc_misses;	/* # forw. cache hash table misses */
-	u_quad_t mrt6s_upcalls;		/* # calls to mrouted              */
+	u_quad_t mrt6s_upcalls;		/* # calls to routing daemon       */
 	u_quad_t mrt6s_no_route;	/* no route for packet's origin    */
 	u_quad_t mrt6s_bad_tunnel;	/* malformed tunnel options        */
 	u_quad_t mrt6s_cant_tunnel;	/* no room for tunnel options      */
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
index 6a60582..9b3dd2b 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -290,7 +290,7 @@ mrt_stats(u_long mstaddr)
 
 	p(mrts_mfc_lookups, "\t%lu multicast forwarding cache lookup%s\n");
 	p2(mrts_mfc_misses, "\t%lu multicast forwarding cache miss%s\n");
-	p(mrts_upcalls, "\t%lu upcall%s to mrouted\n");
+	p(mrts_upcalls, "\t%lu upcall%s to routing daemon\n");
 	p(mrts_upq_ovflw, "\t%lu upcall queue overflow%s\n");
 	p(mrts_upq_sockfull,
 	    "\t%lu upcall%s dropped due to full socket buffer\n");
diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c
index e931243..51759b8 100644
--- a/usr.bin/netstat/mroute6.c
+++ b/usr.bin/netstat/mroute6.c
@@ -216,7 +216,7 @@ mrt6_stats(u_long mstaddr)
 
 	p(mrt6s_mfc_lookups, "\t%ju multicast forwarding cache lookup%s\n");
 	p2(mrt6s_mfc_misses, "\t%ju multicast forwarding cache miss%s\n");
-	p(mrt6s_upcalls, "\t%ju upcall%s to mrouted\n");
+	p(mrt6s_upcalls, "\t%ju upcall%s to routing daemon\n");
 	p(mrt6s_upq_ovflw, "\t%ju upcall queue overflow%s\n");
 	p(mrt6s_upq_sockfull,
 	    "\t%ju upcall%s dropped due to full socket buffer\n");
diff --git a/usr.sbin/crunch/examples/really-big.conf b/usr.sbin/crunch/examples/really-big.conf
index f8590ae..1633c59 100644
--- a/usr.sbin/crunch/examples/really-big.conf
+++ b/usr.sbin/crunch/examples/really-big.conf
@@ -69,7 +69,7 @@ srcdirs /usr/src/usr.sbin
 
 progs ac accton amd arp bad144 catman chown chroot config config.new cron
 progs dev_mkdb diskpart edquota flcopy gettable grfinfo hilinfo htable inetd
-progs iostat iteconfig kvm_mkdb mrouted mtree named portmap pppd
+progs iostat iteconfig kvm_mkdb mtree named portmap pppd
 progs pstat pwd_mkdb quot quotaon rarpd rbootd repquota rmt rpc.bootparamd
 progs rwhod sa sliplogin slstats spray sysctl syslogd tcpdump
 progs traceroute trpt trsp update vipw vnconfig ypbind yppoll ypset