Changeset f3c60e6 in code for cmd.c

Timestamp:

Mar 6, 2014, 3:30:44 PM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

460786f

Parents:

3fdebb8

git-author:

Mike Belopuhov <mike@…> (03/06/14 15:27:45)

git-committer:

Mike Belopuhov <mike@…> (03/06/14 15:30:44)

Message:

After some deliberation we have decided that if modtab is enabled
then it should be possible to steal the moderation.

File:

• cmd.c (modified) (2 diffs)

cmd.c

@@ -303 +303 @@
         char whom[ICB_MAXNICKLEN];
 
-        if (!ig->mod) {         /* if there is no mod, let anyone grab it */
-                if (icb_pass(ig, ig->mod, is) < 0)
+        if (!ig->mod) {         /* if there is no mod, try grabbing it */
+                if (icb_modpermit(is, 0) && icb_pass(ig, ig->mod, is) < 0)
                         icb_error(is, "Acquiring group moderation failed.");
         } else if (icb_ismod(ig, is)) {
@@ -321 +321 @@
                         return;
                 }
-                if (icb_pass(ig, ig->mod, s) < 0)
+                if (icb_modpermit(s, 0) && icb_pass(ig, ig->mod, s) < 0)
                         icb_error(s, "Acquiring group moderation failed.");
+        } else {
+                /*
+                 * if group is moderated and we're not the moderator,
+                 * but modtab is enabled, then check the permission
+                 * and pass moderation if successful.
+                 */
+                if (icb_modpermit(is, 1) && icb_pass(ig, ig->mod, is) < 0)
+                        icb_error(is, "Acquiring group moderation failed.");
         }
 }