[cvslog] (2002-10-28 22:18:05 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Mon Oct 28 16:19:00 CST 2002


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2002-10-28 22:18:05 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     src/patch.h src/mod/channels.mod/tclchan.c

Log message:

If global-ban-time/global-exempt-time/global-invite-time was set to 0,
newban/newexempt/newinvite didn't work correctly without specifying
'lifetime', as did ban-time/exempt-time/invite-time for a channel with
newchanban/newchanexempt/newchaninvite. Patch by NeoN.

---------------------- diff included ----------------------
Index: eggdrop1.6/src/mod/channels.mod/tclchan.c
diff -u eggdrop1.6/src/mod/channels.mod/tclchan.c:1.63 eggdrop1.6/src/mod/channels.mod/tclchan.c:1.64
--- eggdrop1.6/src/mod/channels.mod/tclchan.c:1.63	Sun Sep  1 00:07:51 2002
+++ eggdrop1.6/src/mod/channels.mod/tclchan.c	Mon Oct 28 16:17:55 2002
@@ -1,7 +1,7 @@
 /*
  * tclchan.c -- part of channels.mod
  *
- * $Id: tclchan.c,v 1.63 2002/09/01 05:07:51 wcc Exp $
+ * $Id: tclchan.c,v 1.64 2002/10/28 22:17:55 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -509,8 +509,12 @@
   strncpyz(ban, argv[2], sizeof ban);
   strncpyz(from, argv[3], sizeof from);
   strncpyz(cmt, argv[4], sizeof cmt);
-  if (argc == 5)
-    expire_time = now + (60 * chan->ban_time);
+  if (argc == 5) {
+    if (chan->ban_time == 0)
+      expire_time = 0L;
+    else
+      expire_time = now + (60 * chan->ban_time);
+  }
   else {
     if (atoi(argv[5]) == 0)
       expire_time = 0L;
@@ -545,8 +549,12 @@
   strncpyz(ban, argv[1], sizeof ban);
   strncpyz(from, argv[2], sizeof from);
   strncpyz(cmt, argv[3], sizeof cmt);
-  if (argc == 4)
-    expire_time = now + (60 * global_ban_time);
+  if (argc == 4) {
+    if (global_ban_time == 0)
+      expire_time = 0L;
+    else
+      expire_time = now + (60 * global_ban_time);
+  }
   else {
     if (atoi(argv[4]) == 0)
       expire_time = 0L;
@@ -586,8 +594,12 @@
   strncpyz(exempt, argv[2], sizeof exempt);
   strncpyz(from, argv[3], sizeof from);
   strncpyz(cmt, argv[4], sizeof cmt);
-  if (argc == 5)
-    expire_time = now + (60 * chan->exempt_time);
+  if (argc == 5) {
+    if (chan->exempt_time == 0)
+      expire_time = 0L;
+    else
+      expire_time = now + (60 * chan->exempt_time);
+  }
   else {
     if (atoi(argv[5]) == 0)
       expire_time = 0L;
@@ -620,8 +632,12 @@
   strncpyz(exempt, argv[1], sizeof exempt);
   strncpyz(from, argv[2], sizeof from);
   strncpyz(cmt, argv[3], sizeof cmt);
-  if (argc == 4)
-    expire_time = now + (60 * global_exempt_time);
+  if (argc == 4) {
+    if (global_exempt_time == 0)
+      expire_time = 0L;
+    else
+      expire_time = now + (60 * global_exempt_time);
+  }
   else {
     if (atoi(argv[4]) == 0)
       expire_time = 0L;
@@ -660,8 +676,12 @@
   strncpyz(invite, argv[2], sizeof invite);
   strncpyz(from, argv[3], sizeof from);
   strncpyz(cmt, argv[4], sizeof cmt);
-  if (argc == 5)
-    expire_time = now + (60 * chan->invite_time);
+  if (argc == 5) {
+    if (chan->invite_time == 0)
+      expire_time = 0L;
+    else
+      expire_time = now + (60 * chan->invite_time);
+  }
   else {
     if (atoi(argv[5]) == 0)
       expire_time = 0L;
@@ -694,8 +714,12 @@
   strncpyz(invite, argv[1], sizeof invite);
   strncpyz(from, argv[2], sizeof from);
   strncpyz(cmt, argv[3], sizeof cmt);
-  if (argc == 4)
-     expire_time = now + (60 * global_invite_time);
+  if (argc == 4) {
+    if (global_invite_time == 0)
+      expire_time = 0L;
+    else
+      expire_time = now + (60 * global_invite_time);
+  }
   else {
     if (atoi(argv[4]) == 0)
       expire_time = 0L;
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.839 eggdrop1.6/src/patch.h:1.840
--- eggdrop1.6/src/patch.h:1.839	Thu Oct 10 20:59:31 2002
+++ eggdrop1.6/src/patch.h	Mon Oct 28 16:17:55 2002
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.839 2002/10/11 01:59:31 wcc Exp $
+ * $Id: patch.h,v 1.840 2002/10/28 22:17:55 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1034301279");		/* current unixtime */
+patch("1035842977");		/* current unixtime */
 /*
  *
  *
  */
-patch("laston-width");
+patch("bantime-fix");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list