pullup:

1141.   [bug]           When named rejected a control message, it would
                        leak a file descriptor and memory.  It would also
                        fail to respond, causing rndc to hang. [RT #2139]

diff --git a/CHANGES b/CHANGES
index d076f60e86a76553d76201f5522991b94cdcb247..dcf256244a27c2446c02b1db8ad46e4f9733f55d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,11 @@
+1141.  [bug]           When named rejected a control message, it would
+                       leak a file descriptor and memory.  It would also
+                       fail to respond, causing rndc to hang. [RT #2139]
+
 1136.  [bug]           CNAME records synthesized from DNAMEs did not
                        have a TTL of zero as required by RFC2672
                        [RT #2129]
 
-
        --- 9.2.0 released ---
 
 1134.  [bug]           Multithreaded servers could deadlock in ferror()

diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
index 2190227ce1be5f1ee40c498ac8415f5d670f1b90..aa90f26a22066d2b9253a9831dbcdc1d82149b83 100644 (file)
--- a/bin/named/controlconf.c
+++ b/bin/named/controlconf.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: controlconf.c,v 1.28.2.6 2001/10/31 23:00:44 marka Exp $ */
+/* $Id: controlconf.c,v 1.28.2.7 2001/11/27 22:38:14 gson Exp $ */
 
 #include <config.h>
 
@@ -539,6 +539,7 @@ control_newconn(isc_task_t *task, isc_event_t *event) {
                              NS_LOGMODULE_CONTROL, ISC_LOG_WARNING,
                              "rejected command channel message from %s",
                              socktext);
+               isc_socket_detach(&sock);
                goto restart;
        }
 
@@ -550,6 +551,7 @@ control_newconn(isc_task_t *task, isc_event_t *event) {
                              NS_LOGMODULE_CONTROL, ISC_LOG_WARNING,
                              "dropped command channel from %s: %s",
                              socktext, isc_result_totext(result));
+               isc_socket_detach(&sock);
                goto restart;
        }