Changeset f3c60e6 in code

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.

Files:

• cmd.c (modified) (2 diffs)
• icb.c (modified) (3 diffs)
• icb.h (modified) (1 diff)

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.");
         }
 }

icb.c

@@ -37 +37 @@
 void   icb_login(struct icb_session *, char *, char *, char *);
 int    icb_dowho(struct icb_session *, struct icb_group *);
-int    icb_modpermit(struct icb_session *);
 char  *icb_nextfield(char **);
 
@@ -547 +546 @@
  */
 int
-icb_modpermit(struct icb_session *is)
+icb_modpermit(struct icb_session *is, int enforce)
 {
         extern char modtab[ICB_MTABLEN][ICB_MAXNICKLEN];
         extern int modtabcnt;
 
-        if (modtabcnt == 0 ||
+        if ((enforce ? 0 : modtabcnt == 0) ||
             bsearch(is->nick, modtab, modtabcnt, ICB_MAXNICKLEN,
             (int (*)(const void *, const void *))strcmp))
@@ -572 +571 @@
                 return (-1);
         if (!from && !to)
-                return (-1);
-        if (to && !icb_modpermit(to))
                 return (-1);
         ig->mod = to;

icb.h

@@ -129 +129 @@
 void             icb_input(struct icb_session *);
 inline int       icb_ismod(struct icb_group *, struct icb_session *);
-int              icb_modpermit(struct icb_session *);
+int              icb_modpermit(struct icb_session *, int);
 int              icb_pass(struct icb_group *, struct icb_session *,
                      struct icb_session *);