Sec 2956 cleanup

bk: 563b291572qjlHsL3cXbCusWlasuBQ

diff --git a/include/ntpd.h b/include/ntpd.h
index be3cd3e7619b0f71ad891675a280ee4b893d4b0e..56ec7cae73719c87bbe6a85f417c99536e9a2745 100644 (file)
--- a/include/ntpd.h
+++ b/include/ntpd.h
@@ -408,6 +408,7 @@ extern int  hardpps_enable;         /* kernel PPS discipline enabled */
 extern int     ext_enable;             /* external clock enabled */
 extern int     cal_enable;             /* refclock calibrate enable */
 extern int     allow_panic;            /* allow panic correction (-g) */
+extern int     enable_panic_check;     /* Can we check allow_panic's state? */
 extern int     force_step_once;        /* always step time once at startup (-G) */
 extern int     mode_ntpdate;           /* exit on first clock set (-q) */
 extern int     peer_ntpdate;           /* count of ntpdate peers */

diff --git a/libntp/systime.c b/libntp/systime.c
index 00fd8dda56e27e3d95d16c5951179143093a6b48..c89d157cb2ada837d45b5e6ea2998e1ad6a47eaa 100644 (file)
--- a/libntp/systime.c
+++ b/libntp/systime.c
@@ -25,9 +25,8 @@
 # include <utmpx.h>
 #endif /* HAVE_UTMPX_H */
 
-/* The next line is from ntpd.h */
-extern int     allow_panic;            /* allow panic correction (-g) */
-extern int     enable_panic_check;     /* Can we check allow_panic's state? */
+int    allow_panic = FALSE;            /* allow panic correction (-g) */
+int    enable_panic_check = TRUE;      /* Can we check allow_panic's state? */
 
 #ifndef USE_COMPILETIME_PIVOT
 # define USE_COMPILETIME_PIVOT 1

diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c
index 1c06daba148d8275754fb2b398d19cfa251af036..b19d959147378aa47946d37096a3d422dba877cc 100644 (file)
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -154,8 +154,6 @@ int hardpps_enable;         /* kernel PPS discipline enabled */
 int    ext_enable;             /* external clock enabled */
 int    pps_stratum;            /* pps stratum */
 int    kernel_status;          /* from ntp_adjtime */
-int    allow_panic = FALSE;    /* allow panic correction (-g) */
-int    enable_panic_check = TRUE;      /* Can we check allow_panic's state? */
 int    force_step_once = FALSE; /* always step time once at startup (-G) */
 int    mode_ntpdate = FALSE;   /* exit on first clock set (-q) */
 int    freq_cnt;               /* initial frequency clamp */

diff --git a/ntpdate/ntpdate.c b/ntpdate/ntpdate.c
index 823a57f778e3aa3094a6b0a09106b0111a8721a6..9831929c490b498d92b0ab1d5168d10c3b75898f 100644 (file)
--- a/ntpdate/ntpdate.c
+++ b/ntpdate/ntpdate.c
@@ -198,9 +198,6 @@ int verbose = 0;
 int always_step = 0;
 int never_step = 0;
 
-int allow_panic = FALSE;       /* glue for bug 2956 */
-int enable_panic_check = TRUE; /* Can we check allow_panic's state? */
-
 int    ntpdatemain (int, char **);
 
 static void    transmit        (struct server *);

diff --git a/ntpsnmpd/ntpsnmpd.c b/ntpsnmpd/ntpsnmpd.c
index 57c94fee5884d824680e2c25a596f7b2be54b87a..d96ad3af453ba88add283ec6cba96d33780332a6 100644 (file)
--- a/ntpsnmpd/ntpsnmpd.c
+++ b/ntpsnmpd/ntpsnmpd.c
@@ -43,9 +43,6 @@ stop_server(int a) {
  * wait for SNMP requests coming from the master agent 
  */
 
-int allow_panic = FALSE;       /* Glue for Bug 2956 */
-int enable_panic_check = TRUE; /* Can we check allow_panic's state? */
-
 int
 main (int argc, char **argv) {
   int background = 0; /* start as background process */

diff --git a/sntp/main.c b/sntp/main.c
index 3dacd89f0579bfedff2a102a7e528659bef79744..870db93502b9fd00daf01d34a6dbe7d87a70d277 100644 (file)
--- a/sntp/main.c
+++ b/sntp/main.c
@@ -17,9 +17,6 @@
 #include "libntp.h"
 
 
-int allow_panic = FALSE;       /* Glue for bug 2956 */
-int enable_panic_check = TRUE; /* Can we check allow_panic's state? */
-
 int shutting_down;
 int time_derived;
 int time_adjusted;