svn commit: r203550 - in stable/8/etc: . rc.d

[Hajimu UMEMOTO]

Author: ume
Date: Sat Feb  6 15:32:42 2010
New Revision: 203550
URL: http://svn.freebsd.org/changeset/base/203550

Log:
  MFC r203200; Allow use of -6 option to "server" and "peer" in ntp.conf.

Modified:
  stable/8/etc/rc.d/ntpdate
Directory Properties:
  stable/8/etc/   (props changed)
  stable/8/etc/services   (props changed)

Modified: stable/8/etc/rc.d/ntpdate
==============================================================================
--- stable/8/etc/rc.d/ntpdate	Sat Feb  6 14:10:45 2010	(r203549)
+++ stable/8/etc/rc.d/ntpdate	Sat Feb  6 15:32:42 2010	(r203550)
@@ -19,7 +19,9 @@ ntpdate_start()
 	if [ -z "$ntpdate_hosts" -a -f ${ntpdate_config} ]; then
 		ntpdate_hosts=`awk '
 			/^server[ \t]*127.127/      {next}
-			/^(server|peer)/            {print $2}
+			/^(server|peer)/            {
+			    if ($2 ~/^-/)           {print $3}
+			    else                    {print $2}}
 		' < ${ntpdate_config}`
 	fi
 	if [ -n "$ntpdate_hosts" -o -n "$rc_flags" ]; then