===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.332
retrieving revision 1.333
diff -c -r1.332 -r1.333
*** src/etc/rc	2009/08/12 13:21:15	1.332
--- src/etc/rc	2009/11/23 12:14:25	1.333
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.332 2009/08/12 13:21:15 deraadt Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
--- 1,4 ----
! #	$OpenBSD: rc,v 1.333 2009/11/23 12:14:25 deraadt Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
***************
*** 371,376 ****
--- 371,389 ----
  	echo 'starting named';		named $named_flags
  fi
  
+ if [ ! -f /etc/isakmpd/private/local.key ]; then
+ 	echo -n "openssl: generating new isakmpd RSA key... "
+ 	if /usr/sbin/openssl genrsa -out /etc/isakmpd/private/local.key 2048 \
+ 	    > /dev/null 2>&1; then
+ 		chmod 600 /etc/isakmpd/private/local.key
+ 		openssl rsa -out /etc/isakmpd/local.pub \
+ 		    -in /etc/isakmpd/private/local.key -pubout > /dev/null 2>&1
+ 		echo done.
+ 	else
+ 		echo failed.
+ 	fi
+ fi
+ 
  if [ X"${isakmpd_flags}" != X"NO" ]; then
  	if [ X"${sasyncd_flags}" != X"NO" ]; then
  		isakmpd_flags="-S ${isakmpd_flags}"
***************
*** 596,616 ****
  	fi
  fi
  
- if [ ! -f /etc/isakmpd/private/local.key ]; then
- 	echo -n "openssl: generating new isakmpd RSA key... "
- 	if /usr/sbin/openssl genrsa -out /etc/isakmpd/private/local.key 2048 \
- 	    > /dev/null 2>&1; then
- 		chmod 600 /etc/isakmpd/private/local.key
- 		openssl rsa -out /etc/isakmpd/local.pub \
- 		    -in /etc/isakmpd/private/local.key -pubout > /dev/null 2>&1
- 		echo done.
- 	else
- 		echo failed.
- 	fi
- fi
- 
  echo -n starting network daemons:
  
  if [ X"${snmpd_flags}" != X"NO" ]; then
  	echo -n ' snmpd';		/usr/sbin/snmpd $snmpd_flags
  fi
--- 609,620 ----
  	fi
  fi
  
  echo -n starting network daemons:
  
+ if [ X"${sshd_flags}" != X"NO" ]; then
+ 	echo -n ' sshd';		/usr/sbin/sshd ${sshd_flags};
+ fi
+ 
  if [ X"${snmpd_flags}" != X"NO" ]; then
  	echo -n ' snmpd';		/usr/sbin/snmpd $snmpd_flags
  fi
***************
*** 726,735 ****
  
  if [ X"${inetd}" = X"YES" -a -e /etc/inetd.conf ]; then
  	echo -n ' inetd';		inetd
- fi
- 
- if [ X"${sshd_flags}" != X"NO" ]; then
- 	echo -n ' sshd';		/usr/sbin/sshd ${sshd_flags};
  fi
  
  if [ X"${spamd_flags}" != X"NO" ]; then
--- 730,735 ----