From 4d9b99ccb25be2d74644b150372c208e24f191f5 Mon Sep 17 00:00:00 2001
From: Andreas Gustafsson <source@isc.org>
Date: Wed, 26 Jul 2000 23:45:55 +0000
Subject: [PATCH] the client control event should be a server event, not a DNS
 library event

---
 bin/named/client.c               | 4 ++--
 bin/named/include/named/server.h | 3 ++-
 lib/dns/include/dns/events.h     | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/named/client.c b/bin/named/client.c
index 65958be8cd..49fc46d5bb 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: client.c,v 1.103 2000/07/26 17:39:09 gson Exp $ */
+/* $Id: client.c,v 1.104 2000/07/26 23:45:52 gson Exp $ */
 
 #include <config.h>
 
@@ -1237,7 +1237,7 @@ client_create(ns_clientmgr_t *manager, ns_client_t **clientp)
 	client->interface = NULL;
 	client->peeraddr_valid = ISC_FALSE;
 	ISC_EVENT_INIT(&client->ctlevent, sizeof(client->ctlevent), 0, NULL,
-		       DNS_EVENT_CLIENTCONTROL, client_start, client, client,
+		       NS_EVENT_CLIENTCONTROL, client_start, client, client,
 		       NULL, NULL);
 	ISC_LINK_INIT(client, link);
 	client->list = NULL;
diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h
index 427c1d5f2d..4783c6a55b 100644
--- a/bin/named/include/named/server.h
+++ b/bin/named/include/named/server.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: server.h,v 1.32 2000/06/22 21:49:51 tale Exp $ */
+/* $Id: server.h,v 1.33 2000/07/26 23:45:55 gson Exp $ */
 
 #ifndef NAMED_SERVER_H
 #define NAMED_SERVER_H 1
@@ -30,6 +30,7 @@
 
 #define NS_EVENTCLASS		ISC_EVENTCLASS(0x4E43)
 #define NS_EVENT_RELOAD		(NS_EVENTCLASS + 0)
+#define NS_EVENT_CLIENTCONTROL	(NS_EVENTCLASS + 1)
 
 /*
  * Name server state.  Better here than in lots of separate global variables.
diff --git a/lib/dns/include/dns/events.h b/lib/dns/include/dns/events.h
index da179433f2..8d2440c644 100644
--- a/lib/dns/include/dns/events.h
+++ b/lib/dns/include/dns/events.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: events.h,v 1.25 2000/07/26 17:39:12 gson Exp $ */
+/* $Id: events.h,v 1.26 2000/07/26 23:45:51 gson Exp $ */
 
 #ifndef DNS_EVENTS_H
 #define DNS_EVENTS_H 1
@@ -52,7 +52,6 @@
 #define DNS_EVENT_NOTIFYSENDTOADDR		(ISC_EVENTCLASS_DNS + 23)
 #define DNS_EVENT_ZONE				(ISC_EVENTCLASS_DNS + 24)
 #define DNS_EVENT_ZONESTARTXFRIN		(ISC_EVENTCLASS_DNS + 25)
-#define DNS_EVENT_CLIENTCONTROL			(ISC_EVENTCLASS_DNS + 26)
 
 #define DNS_EVENT_FIRSTEVENT			(ISC_EVENTCLASS_DNS + 0)
 #define DNS_EVENT_LASTEVENT			(ISC_EVENTCLASS_DNS + 65535)