From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 5 Nov 2015 10:01:57 +0000 (+0000)
Subject: Sec 2956 cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5afde7ea12a652b86b86339090ebfffbf99dfaf8;p=thirdparty%2Fntp.git

Sec 2956 cleanup

bk: 563b291572qjlHsL3cXbCusWlasuBQ
---

diff --git a/include/ntpd.h b/include/ntpd.h
index be3cd3e76..56ec7cae7 100644
--- 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 00fd8dda5..c89d157cb 100644
--- 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 1c06daba1..b19d95914 100644
--- 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 823a57f77..9831929c4 100644
--- 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 57c94fee5..d96ad3af4 100644
--- 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 3dacd89f0..870db9350 100644
--- 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;