===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/netstart,v
retrieving revision 1.55
retrieving revision 1.56
diff -c -r1.55 -r1.56
*** src/etc/netstart	2000/01/02 04:38:17	1.55
--- src/etc/netstart	2000/01/02 05:14:52	1.56
***************
*** 1,6 ****
  #!/bin/sh -
  #
! #	$OpenBSD: netstart,v 1.55 2000/01/02 04:38:17 todd Exp $
  
  # Returns true if $1 contains only alphanumerics
  isalphanumeric() {
--- 1,6 ----
  #!/bin/sh -
  #
! #	$OpenBSD: netstart,v 1.56 2000/01/02 05:14:52 itojun Exp $
  
  # Returns true if $1 contains only alphanumerics
  isalphanumeric() {
***************
*** 53,58 ****
--- 53,60 ----
  	# disallow "internal" addresses to appear on the wire.
  	route add -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject
  	route add -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject
+ 
+ 	rtsolif=""
  else
  	ip6kernel=NO
  fi
***************
*** 95,100 ****
--- 97,105 ----
  	    ifconfig $if $name $mask $bcaddr $ext1 $ext2 down
  	    cmd="dhclient $if"
  	    ;;
+ 	"rtsol")
+ 	    rtsolif="$rtsolif $if"
+ 	    ;;
  	"up")
  	    # The only one of these guaranteed to be set is $if
  	    # the remaining ones exist so that media controls work
***************
*** 143,148 ****
--- 148,164 ----
  	eval "$cmd"
      done < /etc/hostname.$if
  done
+ 
+ if [ "$ip6kernel" = "YES" -a "x$rtsolif" != "x" ]; then
+ 	fw=`sysctl -n net.inet6.ip6.forwarding`
+ 	ra=`sysctl -n net.inet6.ip6.accept_rtadv`
+ 	if [ "x$fw" = "x0" -a "x$ra" = "x1" ]; then
+ 		rtsol $rtsolif
+ 	else
+ 		echo "WARNING: inconsistent config - check /etc/sysctl.conf for IPv6 autoconf"
+ 	fi
+ fi
+ 
  for bn in /etc/bridgename.*; do
      # Strip off /etc/bridgename. prefix
      if=${bn#/etc/bridgename.}