===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/netstart,v
retrieving revision 1.111
retrieving revision 1.112
diff -c -r1.111 -r1.112
*** src/etc/netstart	2005/11/02 18:45:26	1.111
--- src/etc/netstart	2005/12/06 17:24:18	1.112
***************
*** 1,6 ****
  #!/bin/sh -
  #
! #	$OpenBSD: netstart,v 1.111 2005/11/02 18:45:26 todd Exp $
  
  # Strip comments (and leading/trailing whitespace if IFS is set)
  # from a file and spew to stdout
--- 1,6 ----
  #!/bin/sh -
  #
! #	$OpenBSD: netstart,v 1.112 2005/12/06 17:24:18 reyk Exp $
  
  # Strip comments (and leading/trailing whitespace if IFS is set)
  # from a file and spew to stdout
***************
*** 330,335 ****
--- 330,336 ----
  # NO			YES			none installed	daemon will run
  # YES/interface		NO			-interface	YES=def. iface
  #	   Any other combination		-reject		config error
+ route -qn delete 224.0.0.0/4 > /dev/null 2>&1
  case "$multicast_host:$multicast_router" in
  NO:NO)
  	route -qn add -net 224.0.0.0/4 -interface 127.0.0.1 -reject > /dev/null
***************
*** 337,343 ****
  NO:YES)
  	;;
  *:NO)
! 	set `if [ $multicast_host = YES ]; then
  		ed -s '!route -qn show -inet' <<EOF
  /^default/p
  EOF
--- 338,344 ----
  NO:YES)
  	;;
  *:NO)
! 	maddr=`if [ "$multicast_host" = "YES" ]; then
  		ed -s '!route -qn show -inet' <<EOF
  /^default/p
  EOF
***************
*** 345,352 ****
  		ed -s "!ifconfig $multicast_host" <<EOF
  /^	inet /p
  EOF
! 	fi`
! 	route -qn add -net 224.0.0.0/4 -interface $2 > /dev/null
  	;;
  *:*)
  	echo 'config error, multicasting disabled until rc.conf is fixed'
--- 346,359 ----
  		ed -s "!ifconfig $multicast_host" <<EOF
  /^	inet /p
  EOF
! 	fi 2> /dev/null`
! 	if [ "X${maddr}" != "X" ]; then
! 		set $maddr
! 		route -qn add -net 224.0.0.0/4 -interface $2 > /dev/null
! 	else
! 		route -qn add -net 224.0.0.0/4 -interface \
! 			127.0.0.1 -reject > /dev/null
! 	fi
  	;;
  *:*)
  	echo 'config error, multicasting disabled until rc.conf is fixed'