From: Michael Poole <mdpoole@troilus.org>
Date: Fri, 2 Sep 2005 02:10:08 +0000 (+0000)
Subject: Whoops, missed a case here.  Fix.
X-Git-Url: http://git.pk910.de/?a=commitdiff_plain;h=94966734dd6bad72d239cb6640467e29c73ff38f;p=ircu2.10.12-pk.git

Whoops, missed a case here.  Fix.


git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1474 c9e4aea6-c8fd-4c43-8297-357d70d61c8c
---

diff --git a/ircd/m_join.c b/ircd/m_join.c
index 70bec20..f00872a 100644
--- a/ircd/m_join.c
+++ b/ircd/m_join.c
@@ -259,7 +259,7 @@ int m_join(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
         err = ERR_NEEDREGGEDNICK;
       else if (find_ban(sptr, chptr->banlist))
         err = ERR_BANNEDFROMCHAN;
-      else if (*chptr->mode.key && strcmp(chptr->mode.key, key))
+      else if (*chptr->mode.key && (BadPtr(key) || strcmp(chptr->mode.key, key)))
         err = ERR_BADCHANNELKEY;
 
       /* An oper with WALK_LCHAN privilege can join a local channel