Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8caf5d3..b4a7ec0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-08  Simon Josefsson  <jas@extundo.com>
+
+       * imap.el (imap-gssapi-auth-p, imap-kerberos4-auth-p): Also check
+       whether `imtest' is installed.
+
 2001-08-04  Nuutti Kotivuori  <nuutti.kotivuori@smarttrust.com>
        Committed by ShengHuo ZHU  <zsh@cs.rochester.edu>
 

diff --git a/lisp/imap.el b/lisp/imap.el
index d171c23..61306f1 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -756,7 +756,14 @@ Returns t if login was successful, nil otherwise."
       ret)))
 
 (defun imap-gssapi-auth-p (buffer)
-  (imap-capability 'AUTH=GSSAPI buffer))
+  (and (imap-capability 'AUTH=GSSAPI buffer)
+       (catch 'imtest-found
+        (let (prg (prgs imap-gssapi-program))
+          (while (setq prg (pop prgs))
+            (condition-case ()
+                (and (call-process (substring prg 0 (string-match " " prg)))
+                     (throw 'imtest-found t))
+              (error nil)))))))
 
 (defun imap-gssapi-auth (buffer)
   (message "imap: Authenticating using GSSAPI...%s"
@@ -764,7 +771,14 @@ Returns t if login was successful, nil otherwise."
   (eq imap-stream 'gssapi))
 
 (defun imap-kerberos4-auth-p (buffer)
-  (imap-capability 'AUTH=KERBEROS_V4 buffer))
+  (and (imap-capability 'AUTH=KERBEROS_V4 buffer)
+       (catch 'imtest-found
+        (let (prg (prgs imap-kerberos4-program))
+          (while (setq prg (pop prgs))
+            (condition-case ()
+                (and (call-process (substring prg 0 (string-match " " prg)))
+                     (throw 'imtest-found t))
+              (error nil)))))))
 
 (defun imap-kerberos4-auth (buffer)
   (message "imap: Authenticating using Kerberos 4...%s"