From 4e4d2a16bc19ebbb7f6daa50d4ed72b7937b567b Mon Sep 17 00:00:00 2001
From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 20 Mar 2007 01:00:23 -0500
Subject: [PATCH] [Bug 796] Clean up duplicate #defines in ntp_control.c

bk: 45ff7877-b-QK08mtEUYReMrGtKmzw
---
 ChangeLog          |  1 +
 ntpd/ntp_control.c | 13 ++++---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f5a18c21..e86e23425 100644
--- 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 a16811533..0c24be8a2 100644
--- 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
-- 
2.47.3