checkpoint

diff --git a/bin/named/query.c b/bin/named/query.c
index 75102fd1369d0c7879704522af48e4cdf12b9488..1faae69fa38f7647c4f6f6dd7c48542fbe3bf665 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.198.2.13.4.36 2005/08/11 05:25:20 marka Exp $ */
+/* $Id: query.c,v 1.198.2.13.4.36.4.1 2006/03/31 00:29:47 marka Exp $ */
 
 #include <config.h>
 
@@ -2098,10 +2098,17 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qdomain,
                        ns_client_killoldestquery(client);
                        result = ISC_R_SUCCESS;
                } else if (result == ISC_R_QUOTA) {
-                       ns_client_log(client, NS_LOGCATEGORY_CLIENT,
-                                     NS_LOGMODULE_QUERY, ISC_LOG_WARNING,
-                                     "no more recursive clients: %s",
-                                     isc_result_totext(result));
+                       static isc_stdtime_t last = 0;
+                       isc_stdtime_t now;
+                       isc_stdtime_get(&now);
+                       if (now != last) {
+                               last = now;
+                               ns_client_log(client, NS_LOGCATEGORY_CLIENT,
+                                             NS_LOGMODULE_QUERY,
+                                             ISC_LOG_WARNING,
+                                             "no more recursive clients: %s",
+                                             isc_result_totext(result));
+                       }
                        ns_client_killoldestquery(client);
                }
                if (result == ISC_R_SUCCESS && !client->mortal &&

diff --git a/bin/named/server.c b/bin/named/server.c
index b9d30d02f644bacb66fce8f6b08cba091d92b692..862148f5599e283b84aa48664ae1f265b55bbda6 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.339.2.15.2.65 2005/07/27 02:53:15 marka Exp $ */
+/* $Id: server.c,v 1.339.2.15.2.65.4.1 2006/03/31 00:29:47 marka Exp $ */
 
 #include <config.h>
 
@@ -4048,12 +4048,13 @@ ns_server_status(ns_server_t *server, isc_buffer_t *text) {
                     "xfers deferred: %u\n"
                     "soa queries in progress: %u\n"
                     "query logging is %s\n"
-                    "recursive clients: %d/%d\n"
+                    "recursive clients: %d/%d/%d\n"
                     "tcp clients: %d/%d\n"
                     "server is up and running",
                     zonecount, ns_g_debuglevel, xferrunning, xferdeferred,
                     soaqueries, server->log_queries ? "ON" : "OFF",
-                    server->recursionquota.used, server->recursionquota.max,
+                    server->recursionquota.used, server->recursionquota.soft,
+                    server->recursionquota.max,
                     server->tcpquota.used, server->tcpquota.max);
        if (n >= isc_buffer_availablelength(text))
                return (ISC_R_NOSPACE);

diff --git a/version b/version
index 5c9032a3ed08196a7181ce3ec5dc8cbde997abc3..94bfff05e1cac95a79a72b1606ff7da75bf6d418 100644 (file)
--- a/version
+++ b/version
@@ -1,4 +1,4 @@
-# $Id: version,v 1.26.2.17.2.21 2005/12/14 00:43:14 marka Exp $
+# $Id: version,v 1.26.2.17.2.21.2.1 2006/03/31 00:29:47 marka Exp $
 #
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
@@ -6,5 +6,5 @@
 MAJORVER=9
 MINORVER=3
 PATCHVER=2
-RELEASETYPE=
+RELEASETYPE=.WFB
 RELEASEVER=