svn commit: r251885 - head/etc/rc.d

[Devin Teske]

Author: dteske
Date: Tue Jun 18 02:37:15 2013
New Revision: 251885
URL: http://svnweb.freebsd.org/changeset/base/251885

Log:
  Allow $ntpdate_config to be NULL. Due to a lack of surrounding quotes, when
  ntpdate_config was set to NULL the conditional would (counter to prevailing
  logic) succeed -- leading to awk attempting to redirect from a NULL pathname
  standard-in. While we're here, make the script consistant with itself by
  removing the {curlies} around ntpdate_config (they are unnecessary).

Modified:
  head/etc/rc.d/ntpdate

Modified: head/etc/rc.d/ntpdate
==============================================================================
--- head/etc/rc.d/ntpdate	Tue Jun 18 02:20:34 2013	(r251884)
+++ head/etc/rc.d/ntpdate	Tue Jun 18 02:37:15 2013	(r251885)
@@ -16,13 +16,13 @@ start_cmd="ntpdate_start"
 
 ntpdate_start()
 {
-	if [ -z "$ntpdate_hosts" -a -f ${ntpdate_config} ]; then
+	if [ -z "$ntpdate_hosts" -a -f "$ntpdate_config" ]; then
 		ntpdate_hosts=`awk '
 			/^server[ \t]*127.127/      {next}
 			/^(server|peer)/            {
 			    if ($2 ~/^-/)           {print $3}
 			    else                    {print $2}}
-		' < ${ntpdate_config}`
+		' < "$ntpdate_config"`
 	fi
 	if [ -n "$ntpdate_hosts" -o -n "$rc_flags" ]; then
 		echo "Setting date via ntp."