Bug 228424

Description of problem:

When -x is included, the /etc/rc.d/init.d/ntpd script will run ntpdate to set
the time before starting ntpd.  In ntpdate fails, then the script will
add a -g option.  If the user-supplied options already include -g, then there
will be two, and consequently ntpd refuses to start (that is new behavior
sometime between 4.2.0 and 4.2.4).

Version-Release number of selected component (if applicable):

ntpd 4.2.4 installed on an FC5 system from ntp-4.2.4-3.i386.rpm built
by me from ntp-4.2.4-3.fc6.src.rpm obtained from Fedora project (hence
I said FC6 as the version for this bug).

How reproducible: easy

Steps to Reproduce:
1. Configure /etc/ntp/step-tickers or server address in
   /etc/ntp.conf to be an unreachable address, and set
   /etc/sysconfig/ntp to:

OPTIONS="-g -x"

2. /etc/rc.d/init.d/ntpd start
  
Actual results:

> /etc/rc.d/init.d/ntpd start
ntpd: Synchronizing with time server:                      [FAILED]
Starting ntpd: ERROR:  only one panicgate option allowed
ntpd - NTP daemon program - Ver. 4.2.4
USAGE:  ntpd [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
[snipped usage text]
Options are specified by doubled hyphens and their name
or by a single hyphen and the flag character.

please send bug reports to:  http://bugs.ntp.isc.org, bugs
                                                           [FAILED]

Expected results:

Even though ntpdate will fail, ntpd should start and run, rather than
quitting.  It will complain about the unreachable server, but if the
server later becomes reachable, ntpd will being peering with it.

Additional info:

The fix I recommend is for the /etc/rc.d/init.d/ntpd script to check if there
already is a -g option present before adding one.  Note that there are two
places in the start cause of that script where a -g is added.