Require -D4 or higher for ntpd SIGALRM debug trace from [Bug 2000].

bk: 4e5ca6cc0ioDacgeeT73T-EbX1tVkg

diff --git a/ChangeLog b/ChangeLog
index 8e964e357f9f54ee68f616047a170480c4a39b6d..509a3c53001c1f611cece230d2105a53e5abd619 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Require -D4 or higher for ntpd SIGALRM debug trace from [Bug 2000].
 (4.2.7p209) 2011/08/27 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2000] ntpd worker threads must block signals expected in main
   thread.

diff --git a/ntpd/ntp_timer.c b/ntpd/ntp_timer.c
index ece53dd043b6ff66c7e1f6d52fa8fca1eaaa82b9..cb291ff12d528f33610133af2a30394f28a33e1e 100644 (file)
--- a/ntpd/ntp_timer.c
+++ b/ntpd/ntp_timer.c
@@ -449,16 +449,16 @@ alarming(
        int sig
        )
 {
-#ifdef DEBUG
+# ifdef DEBUG
        const char *msg = "alarming: initializing TRUE\n";
-#endif
+# endif
 
        if (!initializing) {
                if (alarm_flag) {
                        alarm_overflow++;
-#ifdef DEBUG
+# ifdef DEBUG
                        msg = "alarming: overflow\n";
-#endif
+# endif
                } else {
 # ifndef VMS
                        alarm_flag++;
@@ -466,19 +466,19 @@ alarming(
                        /* VMS AST routine, increment is no good */
                        alarm_flag = 1;
 # endif
-#ifdef DEBUG
+# ifdef DEBUG
                        msg = "alarming: normal\n";
-#endif
+# endif
                }
        }
 # ifdef VMS
        lib$addx(&vmsinc, &vmstimer, &vmstimer);
        sys$setimr(0, &vmstimer, alarming, alarming, 0);
 # endif
-#ifdef DEBUG
-       if (debug)
-               write(2, msg, strlen(msg));
-#endif
+# ifdef DEBUG
+       if (debug >= 4)
+               write(1, msg, strlen(msg));
+# endif
 }
 #endif /* SYS_WINNT */