From 60b4d67273ef0aaf04d9364b7f1317c61018229e Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Mon, 21 Nov 2011 13:51:23 +0100
Subject: Allow specified key for keyless channels

---
 miniircd | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/miniircd b/miniircd
index f4c98cd..74f1fc6 100755
--- a/miniircd
+++ b/miniircd
@@ -196,7 +196,9 @@ class Client(object):
                     self.reply_403(channelname)
                     continue
                 channel = server.get_channel(channelname)
-                if channel and channel.key != keys[i]:
+                if channel \
+                        and channel.key is not None \
+                        and channel.key != keys[i]:
                     self.reply(
                         "475 %s %s :Cannot join channel (+k) - bad key"
                         % (self.nickname, channelname))
-- 
cgit v1.2.3