(dns-get-txt-answer): New function.

(dns-read-txt): Ditto.
(query-dns): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66f91a4..2da88a5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * dns.el (dns-get-txt-answer): New function.
+       (dns-read-txt): Ditto.
+       (query-dns): Use it.
+
 2004-05-21  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-start.el (gnus-get-unread-articles): Don't invalidate

diff --git a/lisp/dns.el b/lisp/dns.el
index 24bce62..0bab5d6 100644 (file)
--- a/lisp/dns.el
+++ b/lisp/dns.el
@@ -306,6 +306,25 @@ If TCP-P, the first two bytes of the package with be the length field."
        (push (match-string 1) dns-servers))
       (setq dns-servers (nreverse dns-servers)))))
 
+(defun dns-read-txt (string)
+  (if (> (length string) 1)
+      (substring string 1)
+    string))
+
+(defun dns-get-txt-answer (answers)
+  (let ((result "")
+       (do-next nil))
+    (dolist (answer answers)
+      (dolist (elem answer)
+       (when (consp elem)
+         (cond
+          ((eq (car elem) 'type)
+           (setq do-next (eq (cadr elem) 'TXT)))
+          ((eq (car elem) 'data)
+           (when do-next
+             (setq result (concat result (dns-read-txt (cadr elem))))))))))
+    result))
+
 ;;; Interface functions.
 (defmacro dns-make-network-process (server)
   (if (featurep 'xemacs)
@@ -373,7 +392,9 @@ If FULLP, return the entire record returned."
                  result
                (let ((answer (car (dns-get 'answers result))))
                  (when (eq type (dns-get 'type answer))
-                   (dns-get 'data answer)))))))))))
+                   (if (eq type 'TXT)
+                       (dns-get-txt-answer (dns-get 'answers result))
+                     (dns-get 'data answer))))))))))))
 
 (provide 'dns)