CHANSERV: VOICE: Fixed hole where users could acquire voice through +q on +v

channels.

--HG--
branch : achievements

diff --git a/chanserv/chanservprivs.c b/chanserv/chanservprivs.c
index d3e03e95246bc4b598d7a97aa0aa52a6c8cac593..522e92b79376bebc0c0c60704c2ffdd66c7d4a12 100644 (file)
--- a/chanserv/chanservprivs.c
+++ b/chanserv/chanservprivs.c
@@ -80,9 +80,9 @@ chanindex *cs_checkaccess(nick *np, const char *chan, unsigned int flags,
   
   if (!cs_privcheck(priv,np)) {
     if ((flags & CA_VOICEPRIV) &&
-       !(rcp && (CIsVoiceAll(rcp)) && 
+       !(rcp && CIsVoiceAll(rcp) && !(rcup && CUIsQuiet(rcup)) &&
          !(cip->channel && (nickbanned(np, cip->channel, 1) || IsInviteOnly(cip->channel)))) &&
-       !(rcup && (CUHasVoicePriv(rcup)))) {
+       !(rcup && CUHasVoicePriv(rcup))) {
       if (!quiet) chanservstdmessage(np, QM_NOACCESSONCHAN, cip->name->content, cmdname);
       return NULL;
     }