From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Tassilo Horn Newsgroups: gmane.emacs.bugs Subject: bug#8385: 24.0.50; rcirc auto-authentication slightly broken Date: Thu, 31 Mar 2011 12:13:17 +0200 Message-ID: <87tyej7g3m.fsf@member.fsf.org> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: dough.gmane.org 1301567990 9950 80.91.229.12 (31 Mar 2011 10:39:50 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 31 Mar 2011 10:39:50 +0000 (UTC) Cc: 8385@debbugs.gnu.org To: Deniz Dogan Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Mar 31 12:39:42 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Q5FHx-0004se-HW for geb-bug-gnu-emacs@m.gmane.org; Thu, 31 Mar 2011 12:39:42 +0200 Original-Received: from localhost ([127.0.0.1]:59484 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5FHr-0003kh-Ge for geb-bug-gnu-emacs@m.gmane.org; Thu, 31 Mar 2011 06:39:35 -0400 Original-Received: from [140.186.70.92] (port=37588 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5FFg-00026I-MV for bug-gnu-emacs@gnu.org; Thu, 31 Mar 2011 06:37:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q5FFX-0008GZ-Je for bug-gnu-emacs@gnu.org; Thu, 31 Mar 2011 06:37:12 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:45189) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q5FFX-0008GS-Gg for bug-gnu-emacs@gnu.org; Thu, 31 Mar 2011 06:37:11 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1Q5Et8-0004H0-Aw; Thu, 31 Mar 2011 06:14:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tassilo Horn Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 31 Mar 2011 10:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 8385 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 8385-submit@debbugs.gnu.org id=B8385.130156640816374 (code B ref 8385); Thu, 31 Mar 2011 10:14:02 +0000 Original-Received: (at 8385) by debbugs.gnu.org; 31 Mar 2011 10:13:28 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q5EsZ-0004G1-7A for submit@debbugs.gnu.org; Thu, 31 Mar 2011 06:13:27 -0400 Original-Received: from deliver.uni-koblenz.de ([141.26.64.15]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q5EsX-0004Fq-Lt for 8385@debbugs.gnu.org; Thu, 31 Mar 2011 06:13:26 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by deliver.uni-koblenz.de (Postfix) with ESMTP id 92C4B7816FE2; Thu, 31 Mar 2011 12:13:19 +0200 (CEST) Original-Received: from deliver.uni-koblenz.de ([127.0.0.1]) by localhost (deliver.uni-koblenz.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 06384-03-3; Thu, 31 Mar 2011 12:13:17 +0200 (CEST) X-CHKRCPT: Envelopesender noch tassilo@member.fsf.org Original-Received: from thinkpad (tsdh.uni-koblenz.de [141.26.67.142]) by deliver.uni-koblenz.de (Postfix) with ESMTP id 6C6877816FA7; Thu, 31 Mar 2011 12:13:17 +0200 (CEST) In-Reply-To: (Deniz Dogan's message of "Thu, 31 Mar 2011 02:21:11 +0200") User-Agent: Gnus/5.110016 (No Gnus v0.16) Emacs/24.0.9999 (gnu/linux) X-Virus-Scanned: amavisd-new at uni-koblenz.de X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Thu, 31 Mar 2011 06:14:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:45522 Archived-At: --=-=-= Content-Type: text/plain Deniz Dogan writes: > Currently when the user connects to an IRC server, rcirc checks if > `rcirc-auto-authenticate-flag' is non-nil and > `rcirc-authenticate-before-join' is non-nil. If they are, a hook is > added to join the user's channels after successfully authenticating. > > However, this is done regardless of whether the user has set up any > authinfo for the server being connected to, i.e., regardless of > whether any of the entries in `rcirc-authinfo' matches the server > address. > > `rcirc-handler-001' needs to be modified so that it first checks whether > the server matches any `rcirc-authinfo' entry before it decides to wait > with auto-joining channels until after authentication. Could you please check if this patch does the trick? --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=rcirc-auth.patch === modified file 'lisp/net/rcirc.el' --- lisp/net/rcirc.el 2011-03-22 11:51:48 +0000 +++ lisp/net/rcirc.el 2011-03-31 07:40:16 +0000 @@ -2454,7 +2454,14 @@ (setq rcirc-nick (car args)) (rcirc-update-prompt) (if rcirc-auto-authenticate-flag - (if rcirc-authenticate-before-join + (if (and rcirc-authenticate-before-join + ;; We have to ensure that there's an authentication + ;; entry for that server. Else, + ;; rcirc-authenticated-hook won't be triggered, and + ;; autojoin won't happen at all. + (dolist (s rcirc-authinfo ret) + (when (string-match (car s) rcirc-server-name) + (setq ret t)))) (progn (add-hook 'rcirc-authenticated-hook 'rcirc-join-channels-post-auth t t) (rcirc-authenticate)) --=-=-= Content-Type: text/plain Bye, Tassilo --=-=-=--