===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.237
retrieving revision 1.238
diff -c -r1.237 -r1.238
*** src/etc/rc	2004/03/02 16:11:10	1.237
--- src/etc/rc	2004/03/03 01:06:44	1.238
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.237 2004/03/02 16:11:10 deraadt Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
--- 1,4 ----
! #	$OpenBSD: rc,v 1.238 2004/03/03 01:06:44 deraadt Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
***************
*** 497,514 ****
  	echo -n ' sendmail';		( /usr/sbin/sendmail ${sendmail_flags} >/dev/null 2>&1 & )
  fi
  
- if [ "X${spamd_flags}" != X"NO" ]; then
- 	if [ "X${spamd_grey}" != X"NO" ]; then
- 		spamd_flags="${spamd_flags} -g"
- 	fi
- 	echo -n ' spamd';		/usr/libexec/spamd ${spamd_flags}
- 	/usr/libexec/spamd-setup
- 	if [ "X${spamd_grey}" != X"NO" ]; then
- 		echo -n ' spamlogd'
- 		/usr/libexec/spamlogd
- 	fi
- fi
- 
  if [ "X${httpd_flags}" != X"NO"  ]; then
  	# Clean up left-over httpd locks
  	rm -f /var/www/logs/{ssl_mutex,httpd.lock,accept.lock}.*
--- 497,502 ----
***************
*** 529,534 ****
--- 517,534 ----
  
  if [ X"${sshd_flags}" != X"NO" ]; then
  	echo -n ' sshd';		/usr/sbin/sshd ${sshd_flags};
+ fi
+ 
+ if [ "X${spamd_flags}" != X"NO" ]; then
+ 	if [ "X${spamd_grey}" != X"NO" ]; then
+ 		spamd_flags="${spamd_flags} -g"
+ 	fi
+ 	echo -n ' spamd';		/usr/libexec/spamd ${spamd_flags}
+ 	/usr/libexec/spamd-setup
+ 	if [ "X${spamd_grey}" != X"NO" ]; then
+ 		echo -n ' spamlogd'
+ 		/usr/libexec/spamlogd
+ 	fi
  fi
  
  # $rarpd_flags is imported from /etc/rc.conf;