fix indentation

[irc/quakenet/newserv.git] / chanserv / chanservuser.c

diff --git a/chanserv/chanservuser.c b/chanserv/chanservuser.c
index 4b8c0c7005e10695368496e4973e9cdacd06221e..c90c4ac3a0cf9d3ef3671b72be00c54d742e9098 100644 (file)
--- a/chanserv/chanservuser.c
+++ b/chanserv/chanservuser.c
@@ -673,7 +673,7 @@ void cs_docheckopvoice(channel *cp, modechanges *changes) {
       continue;
       
     if ((np=getnickbynumeric(cp->users->content[i]))==NULL) {
-      Error("chanserv",ERR_ERROR,"Found non-existent numeric %d on channel %s",cp->users->content[i],
+      Error("chanserv",ERR_ERROR,"Found non-existent numeric %lu on channel %s",cp->users->content[i],
             cp->index->name->content);
       continue;
     }
@@ -691,7 +691,7 @@ void cs_docheckopvoice(channel *cp, modechanges *changes) {
       }
       
       /* chanflag +k checks; kick them if they "obviously" can't rejoin without a ban */
-      if (!CIsKnownOnly(rcp) && !(rcup && CUKnown(rcup))) {
+      if (CIsKnownOnly(rcp) && !(rcup && CUKnown(rcup))) {
         if (IsInviteOnly(cp) || (IsRegOnly(cp) && !IsAccount(np))) {
           localkickuser(chanservnick,cp,np,"Authorised users only.");
         } else {
@@ -732,6 +732,10 @@ void cs_doallautomodes(nick *np) {
     return;
   
   for (rcup=rup->knownon;rcup;rcup=rcup->nextbyuser) {
+    /* Skip suspended channels */
+    if (CIsSuspended(rcup->chan))
+      continue;
+      
     if (rcup->chan->index->channel) {
       /* Channel exists */
       if ((lp=getnumerichandlefromchanhash(rcup->chan->index->channel->users, np->numeric))) {
@@ -828,7 +832,7 @@ void cs_checkbans(channel *cp) {
       continue;
     
     if ((np=getnickbynumeric(cp->users->content[i]))==NULL) {
-      Error("chanserv",ERR_ERROR,"Found numeric %d on channel %s who doesn't exist.",
+      Error("chanserv",ERR_ERROR,"Found numeric %lu on channel %s who doesn't exist.",
            cp->users->content[i], cp->index->name->content);
       continue;
     }