pullup:

 682.   [bug]           nslookup displayed SOA records incorrectly. [RT #665]

diff --git a/CHANGES b/CHANGES
index f4801e3e4e2c624af21843663d22241d9bfe7479..9187fb1e5aaec0ae34062cac52b47da5aa46588d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@
 
  683.  [bug]           File descriptor leak in isc_lex_openfile().
 
+ 682.  [bug]           nslookup displayed SOA records incorrectly. [RT #665]
+
  681.  [bug]           $GENERATE specifying output format was broken. [RT #653]
 
  680.  [bug]           dns_rdata_fromstruct() mishandled options bigger

diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index af9991b2913b817ced5f5bf1fe1fd8383396b3b5..ac1445a16178376a99a88c1e853545a491a4179a 100644 (file)
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nslookup.c,v 1.69.2.1 2001/01/09 22:31:25 bwelling Exp $ */
+/* $Id: nslookup.c,v 1.69.2.2 2001/01/16 18:20:11 gson Exp $ */
 
 #include <config.h>
 
@@ -267,9 +267,6 @@ printsection(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers,
                                        printf("\tmail addr = %s\n",
                                               ptr);
                                        ptr = next_token(&input, " \t\r\n");
-                                       if (ptr == NULL)
-                                               break;
-                                       ptr = next_token(&input, " \t\r\n");
                                        if (ptr == NULL)
                                                break;
                                        printf("\tserial = %s\n",
@@ -431,9 +428,6 @@ detailsection(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers,
                                        printf("\tmail addr = %s\n",
                                               ptr);
                                        ptr = next_token(&input, " \t\r\n");
-                                       if (ptr == NULL)
-                                               break;
-                                       ptr = next_token(&input, " \t\r\n");
                                        if (ptr == NULL)
                                                break;
                                        printf("\tserial = %s\n",