From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/86868 Path: news.gmane.org!not-for-mail From: Jochen Hein Newsgroups: gmane.emacs.gnus.general Subject: [PATCH 3/4] nnimap: handle imap connections with type 'gssapi Date: Sun, 14 Feb 2016 17:07:08 +0100 Message-ID: <1455466029-12376-4-git-send-email-jochen@jochen.org> References: <1455466029-12376-1-git-send-email-jochen@jochen.org> NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1455466298 16806 80.91.229.3 (14 Feb 2016 16:11:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 14 Feb 2016 16:11:38 +0000 (UTC) Cc: larsi@gnus.org, Jochen Hein To: ding@gnus.org Original-X-From: ding-owner+M35088@lists.math.uh.edu Sun Feb 14 17:11:18 2016 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from lists1.math.uh.edu ([129.7.128.208]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aUzGV-00006z-Vu for ding-account@gmane.org; Sun, 14 Feb 2016 17:11:16 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by lists1.math.uh.edu with smtp (Exim 4.85) (envelope-from ) id 1aUzFf-0003pi-2n; Sun, 14 Feb 2016 10:10:23 -0600 Original-Received: from mx1.math.uh.edu ([129.7.128.32]) by lists1.math.uh.edu with esmtps (TLSv1.2:AES128-GCM-SHA256:128) (Exim 4.85) (envelope-from ) id 1aUzFb-0003o9-E0 for ding@lists.math.uh.edu; Sun, 14 Feb 2016 10:10:19 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtps (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.85) (envelope-from ) id 1aUzFY-0006d1-Ky for ding@lists.math.uh.edu; Sun, 14 Feb 2016 10:10:19 -0600 Original-Received: from smtp.dinoex.de ([188.40.204.4] ident=root) by quimby.gnus.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1aUzFW-0003zP-NA; Sun, 14 Feb 2016 17:10:14 +0100 Original-Received: from smtp.dinoex.de (uucp@smtp.dinoex.de [188.40.204.4]) by smtp.dinoex.de (8.15.2/8.15.1) with ESMTPS id u1EGA68s055279 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sun, 14 Feb 2016 17:10:07 +0100 (CET) (envelope-from jochen@jochen.org) Original-Received: (from uucp@localhost) by smtp.dinoex.de (8.15.2/8.15.1/Submit) with UUCP id u1EGA61b055278; Sun, 14 Feb 2016 17:10:06 +0100 (CET) (envelope-from jochen@jochen.org) Original-Received: from jochen.org (echidna.jochen.org [IPv6:fd23:e163:19f7:1234:222:4dff:fe7c:d76a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by jupiter.jochen.org (Postfix) with ESMTPS id C40052B6; Sun, 14 Feb 2016 17:07:38 +0100 (CET) Original-Received: (nullmailer pid 13304 invoked by uid 1004); Sun, 14 Feb 2016 16:07:38 -0000 X-Mailer: git-send-email 2.1.4 In-Reply-To: <1455466029-12376-1-git-send-email-jochen@jochen.org> X-Milter: Spamilter (Reciever: smtp.dinoex.de; Sender-ip: 188.40.204.4; Sender-helo: smtp.dinoex.de;) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (smtp.dinoex.de [188.40.204.4]); Sun, 14 Feb 2016 17:10:07 +0100 (CET) X-Spam-Score: -0.0 (/) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:86868 Archived-At: * lisp/gnus/nnimap.el (nnimap-open-connection-1): handle imap connections with type gssapi. --- lisp/gnus/nnimap.el | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index fc9304f..a92ed76 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -58,7 +58,7 @@ nnimap-server-port (defvoo nnimap-stream 'undecided "How nnimap talks to the IMAP server. The value should be either `undecided', `ssl' or `tls', -`network', `starttls', `plain', or `shell'. +`network', `starttls', `plain', `gssapi', or `shell'. If the value is `undecided', nnimap tries `ssl' first, then falls back on `network'.") @@ -407,6 +407,10 @@ nnimap-open-connection-1 (nnheader-message 7 "Opening connection to %s via shell..." nnimap-address) '("imap")) + ((eq nnimap-stream 'gssapi) + (nnheader-message 7 "Opening connection to %s via GSSAPI..." + nnimap-address) + '(143)) ((memq nnimap-stream '(ssl tls)) (nnheader-message 7 "Opening connection to %s via tls..." nnimap-address) @@ -460,7 +464,9 @@ nnimap-open-connection-1 (setf (nnimap-capabilities nnimap-object) (mapcar #'upcase (split-string capabilities))) - (unless (string-match-p "[*.] PREAUTH" greeting) + (unless (or + (eq nnimap-stream 'gssapi) + (string-match-p "[*.] PREAUTH" greeting)) (if (not (setq credentials (if (eq nnimap-authenticator 'anonymous) (list "anonymous" -- 2.1.4