2006-02-20 Lars Magne Ingebrigtsen <larsi@gnus.org>

	* gnus-int.el (gnus-open-server): Respect gnus-batch-mode.

2005-12-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>

	* dns.el (query-dns): Protect more against buggy tcp output.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1ee9098..5f0543e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-int.el (gnus-open-server): Respect gnus-batch-mode.
+
+2005-12-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * dns.el (query-dns): Protect more against buggy tcp output.
+

 2006-02-24  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * nnweb.el (nnweb-type-definition, nnweb-gmane-search): Use new
 2006-02-24  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * nnweb.el (nnweb-type-definition, nnweb-gmane-search): Use new

diff --git a/lisp/dns.el b/lisp/dns.el
index efd9a7d..05b2f73 100644 (file)
--- a/lisp/dns.el
+++ b/lisp/dns.el
@@ -408,7 +408,7 @@ If REVERSEP, look up an IP address."
                     (>= (buffer-size) 2))
            (goto-char (point-min))
            (delete-region (point) (+ (point) 2)))
                     (>= (buffer-size) 2))
            (goto-char (point-min))
            (delete-region (point) (+ (point) 2)))

-         (unless (zerop (buffer-size))
+         (when (>= (buffer-size) 2)

            (let ((result (dns-read (buffer-string))))
              (if fullp
                  result
            (let ((result (dns-read (buffer-string))))
              (if fullp
                  result

diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index 6e59634..586b005 100644 (file)
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -250,10 +250,12 @@ If it is down, start it up (again)."
                               ;; recurse to open the agent's backend.
                               (setq open-offline (eq gnus-server-unopen-status 'offline))
                               gnus-server-unopen-status)
                               ;; recurse to open the agent's backend.
                               (setq open-offline (eq gnus-server-unopen-status 'offline))
                               gnus-server-unopen-status)

-                             ((gnus-y-or-n-p
-                               (format "Unable to open %s:%s, go offline? "
-                                       (car gnus-command-method)
-                                       (cadr gnus-command-method)))
+                             ((and
+                              (not gnus-batch-mode)
+                              (gnus-y-or-n-p
+                               (format "Unable to open %s:%s, go offline? "
+                                       (car gnus-command-method)
+                                       (cadr gnus-command-method))))

                               (setq open-offline t)
                               'offline)
                              (t
                               (setq open-offline t)
                               'offline)
                              (t