===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.394
retrieving revision 1.395
diff -c -r1.394 -r1.395
*** src/etc/rc	2011/10/06 20:49:25	1.394
--- src/etc/rc	2011/10/07 16:36:26	1.395
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.394 2011/10/06 20:49:25 deraadt Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
--- 1,4 ----
! #	$OpenBSD: rc,v 1.395 2011/10/07 16:36:26 deraadt Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
***************
*** 220,225 ****
--- 220,230 ----
  INRC=1; export INRC
  PATH=/sbin:/bin:/usr/sbin:/usr/bin
  export PATH
+ 
+ # must set the domainname before rc.conf, so YP startup choices can be made
+ if [ -f /etc/defaultdomain ]; then
+ 	domainname `stripcom /etc/defaultdomain`
+ fi
  
  # pick up option configuration
  . /etc/rc.conf