conf/75538: change xntpd to ntpd in /etc/*

[TAOKA Fumiyoshi]

>Number:         75538
>Category:       conf
>Synopsis:       change xntpd to ntpd in /etc/*
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 27 12:10:27 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     TAOKA Fumiyoshi
>Release:        FreeBSD RELENG_4
>Organization:
>Environment:
FreeBSD RELENG_4
>Description:
	After change from xntpd to ntpd, it is still used
	not "ntpd" but "xntpd" in /etc on RELENG_4.
	
>How-To-Repeat:
>Fix:

Index: rc.network
===================================================================
RCS file: /home/ncvs/src/etc/Attic/rc.network,v
retrieving revision 1.74.2.46
diff -u -r1.74.2.46 rc.network
--- rc.network	7 Apr 2004 09:27:30 -0000	1.74.2.46
+++ rc.network	27 Dec 2004 11:19:31 -0000
@@ -564,9 +564,9 @@
 		;;
 	esac
 
-	case ${xntpd_enable} in
+	case ${ntpd_enable} in
 	[Yy][Ee][Ss])
-		echo -n ' ntpd';	${xntpd_program:-ntpd} ${xntpd_flags}
+		echo -n ' ntpd';	${ntpd_program:-ntpd} ${ntpd_flags}
 		;;
 	esac
 
Index: defaults/rc.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/rc.conf,v
retrieving revision 1.53.2.66
diff -u -r1.53.2.66 rc.conf
--- defaults/rc.conf	27 Sep 2004 18:46:00 -0000	1.53.2.66
+++ defaults/rc.conf	27 Dec 2004 11:18:23 -0000
@@ -184,9 +184,9 @@
 ntpdate_enable="NO"		# Run ntpdate to sync time on boot (or NO).
 ntpdate_program="/usr/sbin/ntpdate"	# path to ntpdate, if you want a different one.
 ntpdate_flags="-b"		# Flags to ntpdate (if enabled).
-xntpd_enable="NO"		# Run ntpd Network Time Protocol (or NO).
-xntpd_program="/usr/sbin/ntpd"	# path to ntpd, if you want a different one.
-xntpd_flags="-p /var/run/ntpd.pid"	# Flags to ntpd (if enabled).
+ntpd_enable="NO"		# Run ntpd Network Time Protocol (or NO).
+ntpd_program="/usr/sbin/ntpd"	# path to ntpd, if you want a different one.
+ntpd_flags="-p /var/run/ntpd.pid"	# Flags to ntpd (if enabled).
 
 # Network Information Services (NIS) options: All need portmap_enable="YES" ###
 nis_client_enable="NO"		# We're an NIS client (or NO).

>Release-Note:
>Audit-Trail:
>Unformatted: