[Bug 796] Clean up duplicate #defines in ntp_control.c

bk: 45ff7877-b-QK08mtEUYReMrGtKmzw

diff --git a/ChangeLog b/ChangeLog
index 7f5a18c2128b2c67e73e2b0e288064e542ff7dcd..e86e234257c560532aabe2916b6543a867dba852 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 796] Clean up duplicate #defines in ntp_control.c.
 * [Bug 569] Use the correct precision for the Leitch CSD-5300.
 * [Bug 795] Moved declaration of variable to top of function.
 * [Bug 798] ntpq [p typo crashes ntpq/ntpdc.

diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c
index a16811533d600c0913a75d01c1e69f13df9da142..0c24be8a2134dad2bda8e55a76ceaa16100fb185 100644 (file)
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -22,22 +22,17 @@
 /*
  * Structure to hold request procedure information
  */
-#define NOAUTH 0
-#define AUTH   1
-
-#define NO_REQUEST     (-1)
 
 struct ctl_proc {
        short control_code;             /* defined request code */
+#define NO_REQUEST     (-1)
        u_short flags;                  /* flags word */
+               /* Only one flag.  Authentication required or not. */
+#define NOAUTH 0
+#define AUTH   1
        void (*handler) (struct recvbuf *, int); /* handle request */
 };
 
-/*
- * Only one flag.  Authentication required or not.
- */
-#define NOAUTH 0
-#define AUTH   1
 
 /*
  * Request processing routines