X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fcmd_neonserv_deopall.c;h=5279ce42ff0c903d74111f4b11005180abbe0f74;hb=bb5692b9cbff069abbf9573c81e86c3cd2061ceb;hp=69d4680a1cbac2622cac424033531839858a36dd;hpb=c575e458c6257e75b97884847143b20965a5dfda;p=NeonServV5.git

diff --git a/src/cmd_neonserv_deopall.c b/src/cmd_neonserv_deopall.c
index 69d4680..5279ce4 100644
--- a/src/cmd_neonserv_deopall.c
+++ b/src/cmd_neonserv_deopall.c
@@ -1,5 +1,5 @@
-/* cmd_neonserv_deopall.c - NeonServ v5.2
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* cmd_neonserv_deopall.c - NeonServ v5.3
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -68,11 +68,11 @@ static void neonserv_cmd_deopall_async1(struct ClientSocket *client, struct Clie
     if(argc > 0)
         nickmask = argv[0];
     modeBuf = initModeBuffer(client, chan);
-    issuer_access = getChannelAccess(user, chan, 0);
+    issuer_access = getChannelAccess(user, chan);
     for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
         if(nickmask && match(nickmask, chanuser->user->nick)) continue;
-        victim_access = getChannelAccess(user, chan, 0);
-        if(victim_access >= issuer_access) continue;
+        victim_access = getChannelAccess(chanuser->user, chan);
+        if(victim_access >= issuer_access || isNetworkService(chanuser->user)) continue;
         if(!(chanuser->flags & CHANUSERFLAG_OPPED)) continue;
         modeBufferDeop(modeBuf, chanuser->user->nick);
         done_users++;