2001-06-19 Simon Josefsson <jas@extundo.com>

	* imap.el (imap-process-connection-type): New variable.
	(imap-kerberos4-open, imap-gssapi-open): Use it.  This makes
	recent `imtest's work completely (no line length issues), while
	making making old `imtest's unusable.  Thanks to NAGY Andras
	<nagya@inf.elte.hu> for his work.

2000-12-30  NAGY Andras <nagya@inf.elte.hu>

	* imap.el (imap-ssl-program): Add -quiet to shut up
	OpenSSL/SSLeay's internal debug talk.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95dc0ca..0313f3f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2001-06-19  Simon Josefsson  <jas@extundo.com>
+
+       * imap.el (imap-process-connection-type): New variable.
+       (imap-kerberos4-open, imap-gssapi-open): Use it.  This makes
+       recent `imtest's work completely (no line length issues), while
+       making making old `imtest's unusable.  Thanks to NAGY Andras
+       <nagya@inf.elte.hu> for his work.
+
+2000-12-30  NAGY Andras <nagya@inf.elte.hu>
+
+       * imap.el (imap-ssl-program): Add -quiet to shut up
+       OpenSSL/SSLeay's internal debug talk.
+
 2001-06-19  Matt Armstrong <matt@lickey.com>
 
        * imap.el (imap-parse-flag-list): Workaround bug in Courier IMAP

diff --git a/lisp/imap.el b/lisp/imap.el
index 70712fd..76f9956 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -188,10 +188,10 @@ the list is tried until a successful connection is made."
   :group 'imap
   :type '(repeat string))
 
-(defcustom imap-ssl-program '("openssl s_client -ssl3 -connect %s:%p"
-                             "openssl s_client -ssl2 -connect %s:%p"
-                             "s_client -ssl3 -connect %s:%p"
-                             "s_client -ssl2 -connect %s:%p")
+(defcustom imap-ssl-program '("openssl s_client -quiet -ssl3 -connect %s:%p"
+                             "openssl s_client -quiet -ssl2 -connect %s:%p"
+                             "s_client -quiet -ssl3 -connect %s:%p"
+                             "s_client -quiet -ssl2 -connect %s:%p")
   "A string, or list of strings, containing commands for SSL connections.
 Within a string, %s is replaced with the server address and %p with
 port number on server.  The program should accept IMAP commands on
@@ -214,6 +214,11 @@ until a successful connection is made."
   :group 'imap
   :type '(repeat string))
 
+(defcustom imap-process-connection-type nil
+  "*Value for `process-connection-type' to use for Kerberos4 and GSSAPI."
+  :group 'imap
+  :type 'boolean)
+
 (defvar imap-shell-host "gateway"
   "Hostname of rlogin proxy.")
 
@@ -448,6 +453,7 @@ If ARGS, PROMPT is used as an argument to `format'."
       (let* ((port (or port imap-default-port))
             (coding-system-for-read imap-coding-system-for-read)
             (coding-system-for-write imap-coding-system-for-write)
+            (process-connection-type imap-process-connection-type)
             (process (start-process 
                       name buffer shell-file-name shell-command-switch
                       (format-spec
@@ -511,6 +517,7 @@ If ARGS, PROMPT is used as an argument to `format'."
       (let* ((port (or port imap-default-port))
             (coding-system-for-read imap-coding-system-for-read)
             (coding-system-for-write imap-coding-system-for-write)
+            (process-connection-type imap-process-connection-type)
             (process (start-process 
                       name buffer shell-file-name shell-command-switch
                       (format-spec