From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/86867 Path: news.gmane.org!not-for-mail From: Jochen Hein Newsgroups: gmane.emacs.gnus.general Subject: [PATCH 1/4] open-gssapi-stream: remove parameter user Date: Sun, 14 Feb 2016 17:07:06 +0100 Message-ID: <1455466029-12376-2-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 16804 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+M35090@lists.math.uh.edu Sun Feb 14 17:11:17 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-00006y-S6 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 1aUzFk-0003qm-JZ; Sun, 14 Feb 2016 10:10:28 -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 1aUzFd-0003og-1e for ding@lists.math.uh.edu; Sun, 14 Feb 2016 10:10:21 -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-0006d2-Kx for ding@lists.math.uh.edu; Sun, 14 Feb 2016 10:10:20 -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-UA; Sun, 14 Feb 2016 17:10:15 +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 u1EGA68c055269 (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 u1EGA65k055268; 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 979132B6; Sun, 14 Feb 2016 17:07:33 +0100 (CET) Original-Received: (nullmailer pid 13245 invoked by uid 1004); Sun, 14 Feb 2016 16:07:33 -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: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:86867 Archived-At: Remove the parameter user from open-gssapi-stream, the processing of that parameter and '?l' from the gssapi-program template. Now we can call open-gssapi-stream from open-network-stream. * lisp/gnus/gssapi.el (gssapi-program): remove username in command templates. (open-gssapi-stream): remove the parameter user, so we can call open-gssapi-stream from open-network-stream. --- lisp/gnus/gssapi.el | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lisp/gnus/gssapi.el b/lisp/gnus/gssapi.el index 1f72805..08b2ec3 100644 --- a/lisp/gnus/gssapi.el +++ b/lisp/gnus/gssapi.el @@ -29,9 +29,8 @@ (defcustom gssapi-program (list (concat "gsasl %s %p " - "--mechanism GSSAPI " - "--authentication-id %l") - "imtest -m gssapi -u %l -p %p %s") + "--mechanism GSSAPI ") + "imtest -m gssapi -p %p %s") "List of strings containing commands for GSSAPI (krb5) authentication. %s is replaced with server hostname, %p with port to connect to, and %l with the user name. The program should accept commands on @@ -41,7 +40,7 @@ gssapi-program :group 'network :type '(repeat string)) -(defun open-gssapi-stream (name buffer server port user) +(defun open-gssapi-stream (name buffer server port) (let ((cmds gssapi-program) cmd done) (with-current-buffer buffer @@ -57,8 +56,7 @@ open-gssapi-stream cmd (format-spec-make ?s server - ?p (number-to-string port) - ?l user)))) + ?p (number-to-string port))))) response) (when process (while (and (memq (process-status process) '(open run)) @@ -92,7 +90,6 @@ open-gssapi-stream (setq response (match-string 1))))) (accept-process-output process 1) (sit-for 1)) - (erase-buffer) (message "GSSAPI connection: %s" (or response "failed")) (if (and response (let ((case-fold-search nil)) (not (string-match "failed" response)))) -- 2.1.4