===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/etc/rc	1996/04/24 12:43:24	1.7
--- src/etc/rc	1996/04/29 08:02:59	1.8
***************
*** 93,108 ****
  echo -n 'starting rpc daemons:'
  echo -n ' portmap';		portmap
  
! if [ -d /var/yp/`domainname`]; then
! 	echo -n 'ypserv';		ypserv -d
! 	#echo -n 'ypxfrd';		ypxfrd
! 	if [ `ypwhich -m passwd` = `hostname`]; then
! 		echo -n 'rpc.yppasswdd'; rpc.yppasswdd
! 	fi
! fi
! 
! if [ -f /usr/sbin/ypbind -a -d /var/yp ]; then
  	echo -n ' ypbind';		ypbind
  fi
  
  # $nfs_server is imported from /etc/netstart;
--- 93,122 ----
  echo -n 'starting rpc daemons:'
  echo -n ' portmap';		portmap
  
! if [ -d /var/yp ]; then
  	echo -n ' ypbind';		ypbind
+ 
+ 	if [ -d /var/yp/`domainname` ]; then
+ 		# yp server capabilities needed...
+ 		echo -n 'ypserv';		ypserv -d
+ 		#echo -n 'ypxfrd';		ypxfrd
+ 
+ 		# if we are the master server, run rpc.yppasswdd
+ 		_host1=`ypwhich -m passwd 2> /dev/null`
+ 		_host2=`hostname`
+ 		if grep '^lookup' /etc/resolv.conf | grep yp | wc; then
+ 			_host1=`ypmatch $_host1 hosts | cut -d'	' -f2`
+ 			_host2=`ypmatch $_host2 hosts | cut -d'	' -f2 | head -1`
+ 		else
+ 			_host1=`nslookup $_host1 | grep '^Name: ' | \
+ 			    sed -e 's/^Name:    //'`
+ 			_host2=`nslookup $_host2 | grep '^Name: ' | \
+ 			    sed -e 's/^Name:    //'`
+ 		fi
+ 		if [ "$host2" = "$host1" ]; then
+ 			echo -n 'rpc.yppasswdd'; rpc.yppasswdd
+ 		fi
+ 	fi
  fi
  
  # $nfs_server is imported from /etc/netstart;