From e17a73b8591741d00e7727d2dc016e3509a62033 Mon Sep 17 00:00:00 2001
From: Janik Kleinhoff <ilbelkyr@shalture.org>
Date: Sun, 25 Dec 2016 19:08:11 +0000
Subject: Split 'pass' option into 'server_pass', 'account_pass'

Also remove the --pass command-line option for now and introduce a
backward compatibility check that warns when the old option is
encountered. This check is now placed with the mysql option checks in a
dedicated function.

---

So one day, I looked over the AntiSpamMeta console log and noticed
NickServ was echoing back part of the password to us in a "no such
username" error. This is due to us using the 'pass' option for both
nickserv and server password, so we sent PASS NickServPassword.
However, the password happened to have a ':' in it, so services
interpreted it as a user:password combination.
---
 lib/ASM/Event.pm    | 4 ++--
 lib/ASM/Services.pm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/ASM/Event.pm b/lib/ASM/Event.pm
index 5e0435c..8c1a54b 100644
--- a/lib/ASM/Event.pm
+++ b/lib/ASM/Event.pm
@@ -166,9 +166,9 @@ sub on_connect {
   $conn->sl("MODE $event->{args}->[0] +Q");
   if (lc $event->{args}->[0] ne lc $::settings->{nick}) {
     ASM::Util->dprint('Attempting to regain my main nick', 'startup');
-    $conn->sl("NickServ regain $::settings->{nick} $::settings->{pass}");
+    $conn->sl("NickServ regain $::settings->{nick} $::settings->{account_pass}");
   }# else {
-#    $conn->sl("NickServ identify $::settings->{nick} $::settings->{pass}");
+#    $conn->sl("NickServ identify $::settings->{nick} $::settings->{account_pass}");
 #  }
   $conn->sl('CAP REQ :extended-join multi-prefix account-notify'); #god help you if you try to use this bot off freenode
 }
diff --git a/lib/ASM/Services.pm b/lib/ASM/Services.pm
index f3da82c..5aa0741 100644
--- a/lib/ASM/Services.pm
+++ b/lib/ASM/Services.pm
@@ -27,7 +27,7 @@ sub doServices {
     if ( $event->{args}->[0] =~ /^Please identify/ || $event->{args}->[0] =~ /^This nickname is registered/ )
     {
       $::no_autojoins = 0;
-      $conn->sl("NickServ identify $::settings->{nick} $::settings->{pass}" );
+      $conn->sl("NickServ identify $::settings->{nick} $::settings->{account_pass}" );
     }
     elsif ( $event->{args}->[0] =~ /^You are now identified/ )
     {
-- 
cgit v1.2.3