bug#10162: [PATCH] 24.0.91; rcirc autojoin broken (freenode/oftc) when rcirc-authenticate-before-join is set

[Steve Scott]

Since the hostname returned by irc.freenode.net can be something other
than irc.freenode.net, e.g. niven.freenode.net, the entries for
rcirc-authinfo and rcirc-server-alist will not match.

Hence checking rcirc-server-name (the hostname returned) instead of
rcirc-server (the hostname connected to) will cause the auth-required
condition to fail because of the mismatch. The hostname in
rcirc-authinfo won't be found and the authentication hook will be skipped.

The authenticate and join functions still get called in the ELSE in this
case but there is no waiting for the authentication to be successful
before joining the channels.

Moreover, if rcirc-auto-authenticate-flag is set, there should indeed be
a check for the corresponding rcirc-authinfo, regardless of whether the
rcirc-authenticate-before-join must happen. Otherwise, there's no point
in calling authenticate.

My proposed patch enclosed.

Thanks,

Steve Scott


diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 9c3828caf5..0f1904ea0e 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2545,16 +2545,15 @@ rcirc-handler-001
     (setq rcirc-server-name sender)
     (setq rcirc-nick (car args))
     (rcirc-update-prompt)
-    (if rcirc-auto-authenticate-flag
-        (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.
-                (let (auth-required)
-                  (dolist (s rcirc-authinfo auth-required)
-                    (when (string-match (car s) rcirc-server-name)
-                      (setq auth-required t)))))
+    (if (and rcirc-auto-authenticate-flag
+            ;; We have to ensure that there's an authentication
+            ;; entry for that server.  Otherwise,
+             ;; there's no point in calling authenticate.
+            (let (auth-required)
+              (dolist (s rcirc-authinfo auth-required)
+                (when (string-match (car s) rcirc-server)
+                  (setq auth-required t)))))
+        (if rcirc-authenticate-before-join
             (progn
              (add-hook 'rcirc-authenticated-hook 
'rcirc-join-channels-post-auth t t)
               (rcirc-authenticate))