pullup:

 1020.	[bug]		IXFR log messages did not distinguish between
			true IXFRs, AXFR-style IXFRs, and and mere
			version polls. [RT #1811]

diff --git a/CHANGES b/CHANGES
index 9d41733ef73f770baf553d781748b953a487242b..3a9fff7c225ed28f1405025f977befc0f35236f5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1020.  [bug]           IXFR log messages did not distinguish between
+                       true IXFRs, AXFR-style IXFRs, and and mere
+                       version polls. [RT #1811]
+
 1019.  [bug]           The value of the lame-ttl option was limited to 18000
                        seconds, not 1800 seconds as documented. [RT #1803]
 

diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c
index 011ed295d64d65b880330922b849bacf79503c24..63ce0e846bfcbe6fab1aafea26ef14ea0ba4023e 100644 (file)
--- a/bin/named/xfrout.c
+++ b/bin/named/xfrout.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrout.c,v 1.101.2.1 2001/08/31 00:37:12 gson Exp $ */
+/* $Id: xfrout.c,v 1.101.2.2 2001/09/28 22:07:12 bwelling Exp $ */
 
 #include <config.h>
 
@@ -889,6 +889,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) {
        char *journalfile;
        char msg[DNS_RDATACLASS_FORMATSIZE + DNS_NAME_FORMATSIZE
                 + sizeof("zone transfer '/'")];
+       isc_boolean_t is_poll = ISC_FALSE;
 
        switch (reqtype) {
        case dns_rdatatype_axfr:
@@ -1074,6 +1075,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) {
                    (client->attributes & NS_CLIENTATTR_TCP) == 0)
                {
                        CHECK(soa_rrstream_create(mctx, db, ver, &stream));
+                       is_poll = ISC_TRUE;
                        goto have_stream;
                }
                journalfile = dns_zone_getjournal(zone);
@@ -1098,6 +1100,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) {
        axfr_fallback:
                CHECK(axfr_rrstream_create(mctx, db, ver,
                                           &data_stream));
+               mnemonic = "AXFR-style IXFR";
        }
 
        /*
@@ -1131,8 +1134,12 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) {
 
        CHECK(xfr->stream->methods->first(xfr->stream));
 
-       xfrout_log1(client, question_name, question_class, ISC_LOG_INFO,
-                   "%s started", mnemonic);
+       if (is_poll)
+               xfrout_log1(client, question_name, question_class,
+                           ISC_LOG_DEBUG(1), "IXFR poll up to date");
+       else
+               xfrout_log1(client, question_name, question_class,
+                           ISC_LOG_INFO, "%s started", mnemonic);
 
        /*
         * Hand the context over to sendstream().  Set xfr to NULL;