[cvslog] [CVS] Module eggdrop1.6: Change committed

cvs at eggheads.org cvs at eggheads.org
Sun Oct 2 12:25:27 CST 2011


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2011-10-02 18:25:27 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
     THANKS doc/Changes1.6 src/patch.h src/mod/channels.mod/cmdschan.c

Log message:

Altered the permission check on the pls/mns ban/exempt/invite commands from USER_MASTER to USER_OP to allow global operators to set global bans.

---------------------- diff included ----------------------
Index: eggdrop1.6/THANKS
diff -u eggdrop1.6/THANKS:1.11 eggdrop1.6/THANKS:1.12
--- eggdrop1.6/THANKS:1.11	Fri Sep 23 14:31:32 2011
+++ eggdrop1.6/THANKS	Sun Oct  2 12:25:17 2011
@@ -1,4 +1,4 @@
-$Id: THANKS,v 1.11 2011/09/23 20:31:32 thommey Exp $:
+$Id: THANKS,v 1.12 2011/10/02 18:25:17 pseudo Exp $:
 
 Eggdrop Developers and Contributors
 Last revised: June 16, 2010
@@ -428,6 +428,7 @@
 piglet
 pinchaser
 Pixelz         Rickard Utgren                  rutgren at gmail.com
+pjb                                            pjb at decafgeek.org
 plan9
 Plex
 plof
Index: eggdrop1.6/doc/Changes1.6
diff -u eggdrop1.6/doc/Changes1.6:1.113 eggdrop1.6/doc/Changes1.6:1.114
--- eggdrop1.6/doc/Changes1.6:1.113	Sun Oct  2 12:21:35 2011
+++ eggdrop1.6/doc/Changes1.6	Sun Oct  2 12:25:17 2011
@@ -1,4 +1,4 @@
-$Id: Changes1.6,v 1.113 2011/10/02 18:21:35 pseudo Exp $
+$Id: Changes1.6,v 1.114 2011/10/02 18:25:17 pseudo Exp $
 
 Eggdrop Changes (since version 1.6.0)
 
@@ -6,6 +6,10 @@
 
 1.6.21 (CVS):
 
+  - Altered the permission check on the pls/mns ban/exempt/invite commands
+    from USER_MASTER to USER_OP to allow global operators to set global bans.
+    Patch by: pjb
+
   - Made dcc_telnet_new() allow non-latin characters in new handles like other
     handle validation functions.
     Patch by: pseudo
Index: eggdrop1.6/src/mod/channels.mod/cmdschan.c
diff -u eggdrop1.6/src/mod/channels.mod/cmdschan.c:1.86 eggdrop1.6/src/mod/channels.mod/cmdschan.c:1.87
--- eggdrop1.6/src/mod/channels.mod/cmdschan.c:1.86	Sun Feb 13 08:19:33 2011
+++ eggdrop1.6/src/mod/channels.mod/cmdschan.c	Sun Oct  2 12:25:17 2011
@@ -2,7 +2,7 @@
  * cmdschan.c -- part of channels.mod
  *   commands from a user via dcc that cause server interaction
  *
- * $Id: cmdschan.c,v 1.86 2011/02/13 14:19:33 simple Exp $
+ * $Id: cmdschan.c,v 1.87 2011/10/02 18:25:17 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -45,7 +45,7 @@
       chname = newsplit(&par);
     else
       chname = 0;
-    if (chname || !(u->flags & USER_MASTER)) {
+    if (chname || !(u->flags & USER_OP)) {
       if (!chname)
         chname = dcc[idx].u.chat->con_chan;
       get_user_flagrec(u, &user, chname);
@@ -183,7 +183,7 @@
       chname = newsplit(&par);
     else
       chname = 0;
-    if (chname || !(u->flags & USER_MASTER)) {
+    if (chname || !(u->flags & USER_OP)) {
       if (!chname)
         chname = dcc[idx].u.chat->con_chan;
       get_user_flagrec(u, &user, chname);
@@ -311,7 +311,7 @@
       chname = newsplit(&par);
     else
       chname = 0;
-    if (chname || !(u->flags & USER_MASTER)) {
+    if (chname || !(u->flags & USER_OP)) {
       if (!chname)
         chname = dcc[idx].u.chat->con_chan;
       get_user_flagrec(u, &user, chname);
@@ -437,7 +437,7 @@
     chname = dcc[idx].u.chat->con_chan;
     console = 1;
   }
-  if (chname || !(u->flags & USER_MASTER)) {
+  if (chname || !(u->flags & USER_OP)) {
     if (!chname)
       chname = dcc[idx].u.chat->con_chan;
     get_user_flagrec(u, &user, chname);
@@ -450,7 +450,7 @@
   }
   strncpyz(s, ban, sizeof s);
   if (console) {
-    i = u_delban(NULL, s, (u->flags & USER_MASTER));
+    i = u_delban(NULL, s, (u->flags & USER_OP));
     if (i > 0) {
       if (lastdeletedmask)
         mask = lastdeletedmask;
@@ -549,7 +549,7 @@
     chname = dcc[idx].u.chat->con_chan;
     console = 1;
   }
-  if (chname || !(u->flags & USER_MASTER)) {
+  if (chname || !(u->flags & USER_OP)) {
     if (!chname)
       chname = dcc[idx].u.chat->con_chan;
     get_user_flagrec(u, &user, chname);
@@ -561,7 +561,7 @@
   }
   strncpyz(s, exempt, sizeof s);
   if (console) {
-    i = u_delexempt(NULL, s, (u->flags & USER_MASTER));
+    i = u_delexempt(NULL, s, (u->flags & USER_OP));
     if (i > 0) {
       if (lastdeletedmask)
         mask = lastdeletedmask;
@@ -661,7 +661,7 @@
     chname = dcc[idx].u.chat->con_chan;
     console = 1;
   }
-  if (chname || !(u->flags & USER_MASTER)) {
+  if (chname || !(u->flags & USER_OP)) {
     if (!chname)
       chname = dcc[idx].u.chat->con_chan;
     get_user_flagrec(u, &user, chname);
@@ -673,7 +673,7 @@
   }
   strncpyz(s, invite, sizeof s);
   if (console) {
-    i = u_delinvite(NULL, s, (u->flags & USER_MASTER));
+    i = u_delinvite(NULL, s, (u->flags & USER_OP));
     if (i > 0) {
       if (lastdeletedmask)
         mask = lastdeletedmask;
@@ -963,7 +963,7 @@
     }
     if (!chname[0]) {
       i = u_setsticky_exempt(NULL, s,
-                             (dcc[idx].user->flags & USER_MASTER) ? yn : -1);
+                             (dcc[idx].user->flags & USER_OP) ? yn : -1);
       if (i > 0) {
         putlog(LOG_CMDS, "*", "#%s# %sstick exempt %s",
                dcc[idx].nick, yn ? "" : "un", s);
@@ -1001,7 +1001,7 @@
     }
     if (!chname[0]) {
       i = u_setsticky_invite(NULL, s,
-                             (dcc[idx].user->flags & USER_MASTER) ? yn : -1);
+                             (dcc[idx].user->flags & USER_OP) ? yn : -1);
       if (i > 0) {
         putlog(LOG_CMDS, "*", "#%s# %sstick invite %s",
                dcc[idx].nick, yn ? "" : "un", s);
@@ -1033,7 +1033,7 @@
   }
   if (!chname[0]) {
     i = u_setsticky_ban(NULL, s,
-                        (dcc[idx].user->flags & USER_MASTER) ? yn : -1);
+                        (dcc[idx].user->flags & USER_OP) ? yn : -1);
     if (i > 0) {
       putlog(LOG_CMDS, "*", "#%s# %sstick ban %s",
              dcc[idx].nick, yn ? "" : "un", s);
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1267 eggdrop1.6/src/patch.h:1.1268
--- eggdrop1.6/src/patch.h:1.1267	Sun Oct  2 12:21:35 2011
+++ eggdrop1.6/src/patch.h	Sun Oct  2 12:25:17 2011
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1267 2011/10/02 18:21:35 pseudo Exp $
+ * $Id: patch.h,v 1.1268 2011/10/02 18:25:17 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1317578923");            /* current unixtime */
+patch("1317579786");            /* current unixtime */
 /*
  *
  *
  */
-patch("weirdsymbols");
+patch("banfix");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list