From unknown Tue Jun 24 03:27:42 2025 X-Loop: owner@emacsbugs.donarmstrong.com Subject: bug#2404: [PATCH] rcirc - support servers that require a PASS command Reply-To: Jonathan Rockway , 2404-quiet@debbugs.gnu.org Resent-From: Jonathan Rockway Original-Sender: Glenn Morris Resent-To: Resent-Date: Fri, 20 Feb 2009 06:15:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-Emacs-PR-Message: report 2404 X-Emacs-PR-Package: emacs,rcirc X-Emacs-PR-Keywords: Received: via spool by quiet@emacsbugs.donarmstrong.com id=Q.123511032026600 (code Q ref -1); Fri, 20 Feb 2009 06:15:03 +0000 Received: (at quiet) by emacsbugs.donarmstrong.com; 20 Feb 2009 06:12:00 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-7.9 required=4.0 tests=FOURLA,HAS_PACKAGE, IMPRONONCABLE_2,MURPHY_DRUGS_REL8,X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n1K6BvCN026594 for ; Thu, 19 Feb 2009 22:11:58 -0800 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1LaOa3-0005DF-Oy for quiet@emacsbugs.donarmstrong.com; Fri, 20 Feb 2009 01:09:47 -0500 From: Jonathan Rockway To: quiet@debbugs.gnu.org Date: Sun, 15 Feb 2009 14:20:08 -0600 Lines: 111 X-From-Line: emacs-devel-bounces+rgm=gnu.org@gnu.org Sun Feb 15 15:19:10 2009 Received: from mx10.gnu.org ([199.232.76.166]:54096) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1LYnSI-0002dm-F2 for rgm@gnu.org; Sun, 15 Feb 2009 15:19:10 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1LYnUG-0005ax-Dm for rgm@gnu.org; Sun, 15 Feb 2009 15:21:13 -0500 Received: from lists.gnu.org ([199.232.76.165]:44392) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LYnUG-0005aq-6X for rgm@gnu.org; Sun, 15 Feb 2009 15:21:12 -0500 Received: from localhost ([127.0.0.1]:45394 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LYnUG-0007nY-1V for rgm@gnu.org; Sun, 15 Feb 2009 15:21:12 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LYnTi-0007nO-FM for emacs-devel@gnu.org; Sun, 15 Feb 2009 15:20:38 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LYnTg-0007mo-2T for emacs-devel@gnu.org; Sun, 15 Feb 2009 15:20:37 -0500 Received: from [199.232.76.173] (port=59520 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LYnTf-0007mk-SS for emacs-devel@gnu.org; Sun, 15 Feb 2009 15:20:35 -0500 Received: from mx20.gnu.org ([199.232.41.8]:18811) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LYnTf-0005WK-JC for emacs-devel@gnu.org; Sun, 15 Feb 2009 15:20:35 -0500 Received: from dsl092-134-091.chi1.dsl.speakeasy.net ([66.92.134.91] helo=bar.jrock.us) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LYnTS-0002nQ-AH for emacs-devel@gnu.org; Sun, 15 Feb 2009 15:20:22 -0500 Received: by bar.jrock.us (Postfix, from userid 1000) id 102767440AE; Sun, 15 Feb 2009 14:20:09 -0600 (CST) X-detected-kernel: by mx20.gnu.org: Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+rgm=gnu.org@gnu.org X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Sender: Glenn Morris --=-=-= Severity: wishlist Package: emacs,rcirc [ resent from http://lists.gnu.org/archive/html/emacs-devel/2009-02/msg00606.html ] My irc proxy (irssi-proxy) wants a password before allowing connections, so I added support for this to rcirc. The patch is attached. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=rcirc-PASS.patch diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index f63237f..ec1d777 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -80,6 +80,11 @@ VALUE must be a number or string. If absent, VALUE must be a string. If absent, `rcirc-default-user-name' is used. +`:password' + +VALUE must be a string. If absent, no PASS command will be sent +to the server. + `:full-name' VALUE must be a string. If absent, `rcirc-default-full-name' is @@ -94,6 +99,7 @@ connected to automatically." :value-type (plist :options ((:nick string) (:port integer) (:user-name string) + (:password string) (:full-name string) (:channels (repeat string))))) :group 'rcirc) @@ -380,6 +386,8 @@ If ARG is non-nil, instead prompt for connection parameters." (nick (read-string "IRC Nick: " (or (plist-get server-plist 'nick) rcirc-default-nick))) + (password (read-passwd "IRC Password: " + (plist-get server-plist 'password))) (channels (split-string (read-string "IRC Channels: " (mapconcat 'identity @@ -387,9 +395,13 @@ If ARG is non-nil, instead prompt for connection parameters." 'channels) " ")) "[, ]+" t))) + + (when (= 0 (length password)) + (setq password nil)) + (rcirc-connect server port nick rcirc-default-user-name rcirc-default-full-name - channels)) + channels password)) ;; connect to servers in `rcirc-server-alist' (let (connected-servers) (dolist (c rcirc-server-alist) @@ -400,7 +412,8 @@ If ARG is non-nil, instead prompt for connection parameters." rcirc-default-user-name)) (full-name (or (plist-get (cdr c) :full-name) rcirc-default-full-name)) - (channels (plist-get (cdr c) :channels))) + (channels (plist-get (cdr c) :channels)) + (password (plist-get (cdr c) :password))) (when server (let (connected) (dolist (p (rcirc-process-list)) @@ -409,7 +422,7 @@ If ARG is non-nil, instead prompt for connection parameters." (if (not connected) (condition-case e (rcirc-connect server port nick user-name - full-name channels) + full-name channels password) (quit (message "Quit connecting to %s" server))) (with-current-buffer (process-buffer connected) (setq connected-servers @@ -441,7 +454,7 @@ If ARG is non-nil, instead prompt for connection parameters." ;;;###autoload (defun rcirc-connect (server &optional port nick user-name full-name - startup-channels) + startup-channels password) (save-excursion (message "Connecting to %s..." server) (let* ((inhibit-eol-conversion) @@ -490,6 +503,8 @@ If ARG is non-nil, instead prompt for connection parameters." (add-hook 'auto-save-hook 'rcirc-log-write) ;; identify + (when password + (rcirc-send-string process (concat "PASS " password))) (rcirc-send-string process (concat "NICK " nick)) (rcirc-send-string process (concat "USER " user-name " hostname servername :" --=-=-= Regards, Jonathan Rockway -- print just => another => perl => hacker => if $,=$" --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 19 20:40:54 2010 Received: (at control) by debbugs.gnu.org; 20 Jan 2010 01:40:54 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NXPYz-0007Wd-5s for submit@debbugs.gnu.org; Tue, 19 Jan 2010 20:40:53 -0500 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NXPYl-0007WW-Uj for control@debbugs.gnu.org; Tue, 19 Jan 2010 20:40:52 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1NXPYi-0007Sl-Bs; Tue, 19 Jan 2010 20:40:36 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <19286.24340.350706.582414@gargle.gargle.HOWL> Date: Tue, 19 Jan 2010 20:40:36 -0500 From: Glenn Morris To: control Subject: control X-Attribution: GM X-Mailer: VM (www.wonderworks.com/vm), GNU Emacs (www.gnu.org/software/emacs) X-Hue: cyan X-Ran: 8WU:4P)DBN*0i&7=5k?sw9O_ List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -5.0 (-----) close 2951 tags 4206 moreinfo tags 3098 patch tags 2499 patch tags 5297 patch tags 5290 patch tags 1975 patch tags 4470 patch tags 5055 patch tags 3541 patch tags 2527 patch tags 5119 patch tags 2404 patch From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 07 17:37:15 2010 Received: (at control) by debbugs.gnu.org; 7 Jun 2010 21:37:15 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OLk0R-0003Hl-8A for submit@debbugs.gnu.org; Mon, 07 Jun 2010 17:37:15 -0400 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OLk0P-0003Hg-LH for control@debbugs.gnu.org; Mon, 07 Jun 2010 17:37:14 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1OLk0L-0002CP-DT; Mon, 07 Jun 2010 17:37:09 -0400 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <19469.26245.296616.163630@fencepost.gnu.org> Date: Mon, 7 Jun 2010 17:37:09 -0400 From: Glenn Morris To: control Subject: control X-Attribution: GM X-Mailer: VM (www.wonderworks.com/vm), GNU Emacs (www.gnu.org/software/emacs) X-Hue: magenta X-Ran: Nj:Z0*b0_22+P,#yZYKj-bDf{/mE;jBnJo]QQZ(x;3AH*wwG19sY};V*={s:XJyt*xwDf| X-Debbugs-No-Ack: yes X-Spam-Score: -5.1 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -5.1 (-----) close 2404