===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.149
retrieving revision 1.150
diff -c -r1.149 -r1.150
*** src/etc/rc	2000/08/05 06:38:55	1.149
--- src/etc/rc	2000/08/25 16:14:12	1.150
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.149 2000/08/05 06:38:55 deraadt Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
--- 1,4 ----
! #	$OpenBSD: rc,v 1.150 2000/08/25 16:14:12 deraadt Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
***************
*** 349,355 ****
  	ldconfig $shlib_dirs
  fi
  
! if [ ! -f /etc/ssh_host_dsa_key -a -x /usr/bin/ssh-keygen ]; then
  	echo -n "ssh-keygen: generating new DSA host key... "
  	if /usr/bin/ssh-keygen -q -d -f /etc/ssh_host_dsa_key -N ''; then
  		echo done.
--- 349,355 ----
  	ldconfig $shlib_dirs
  fi
  
! if [ ! -f /etc/ssh_host_dsa_key ]; then
  	echo -n "ssh-keygen: generating new DSA host key... "
  	if /usr/bin/ssh-keygen -q -d -f /etc/ssh_host_dsa_key -N ''; then
  		echo done.
***************
*** 357,364 ****
  		echo failed.
  	fi
  fi
! if [ ! -f /etc/ssh_host_key -a -x /usr/bin/ssh-keygen ] && \
!     ssh-keygen -R; then
  	echo -n "ssh-keygen: generating new RSA host key... "
  	if /usr/bin/ssh-keygen -q -f /etc/ssh_host_key -N ''; then
  		echo done.
--- 357,363 ----
  		echo failed.
  	fi
  fi
! if [ ! -f /etc/ssh_host_key ]; then
  	echo -n "ssh-keygen: generating new RSA host key... "
  	if /usr/bin/ssh-keygen -q -f /etc/ssh_host_key -N ''; then
  		echo done.
***************
*** 492,502 ****
  fi
  
  if [ X"${sshd}" == X"YES" ]; then
! 	if [ -x /usr/sbin/sshd ] && /usr/sbin/sshd -Q ; then
! 		echo -n ' sshd'
! 	elif [ -x /usr/local/sbin/sshd ] && /usr/local/sbin/sshd ; then
! 		echo -n ' sshd'
! 	fi
  fi
  
  echo '.'
--- 491,497 ----
  fi
  
  if [ X"${sshd}" == X"YES" ]; then
! 	/usr/sbin/sshd;			echo -n ' sshd'
  fi
  
  echo '.'