Fix for SF bug #2353222 (+l is now removed when dynlimit is disabled)

diff --git a/ChangeLog b/ChangeLog
index 7c436509d19a92820e19e8b0fa88aaa51b44f7fe..9598f14e0612cc4233d89bd73bdd0261f92cc2ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 /***********************************************************************
 X3 ChangeLog
 
+2008-12-24  Neil Spierling  <sirvulcan@sirvulcan.co.nz>
+
+       * src/chanserv.c: Fix for SF bug #2353222 (+l not being removed
+       when dynlimit disabled.
+
 2008-12-24  Neil Spierling  <sirvulcan@sirvulcan.co.nz>
 
        * src/proto-p10.c: Fix for SF bug #2401693 (gsync not working properly).

diff --git a/src/chanserv.c b/src/chanserv.c
index 5555f7c97a2f2f895097863a8055feff39b6ae3b..76c7301d97ce94ff5425ceb360c0b73cf6318999 100644 (file)
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -6199,6 +6199,16 @@ static MODCMD_FUNC(chan_opt_nodelete)
 
 static MODCMD_FUNC(chan_opt_dynlimit)
 {
+    struct mod_chanmode change;
+
+    if (argc > 1) {
+        if (disabled_string(argv[1])) {
+            mod_chanmode_init(&change);
+            change.modes_clear |= MODE_LIMIT;
+            mod_chanmode_announce(chanserv, channel, &change);
+        }
+    }
+
     CHANNEL_BINARY_OPTION("CSMSG_SET_DYNLIMIT", CHANNEL_DYNAMIC_LIMIT);
 }
 
@@ -7275,9 +7285,9 @@ static CHANSERV_FUNC(cmd_spin)
          //snprintf(ban, sizeof(ban), "*!*@%s", user->hostname);
          for (n=count=0; n<user->channels.used; n++) {
              struct mod_chanmode *change;
-             struct banData *bData;
+/*             struct banData *bData; */
             unsigned int exists;
-            int duration = 300;
+/*          int duration = 300; */
             char *ban;
 
             ban = generate_hostmask(user, GENMASK_STRICT_HOST|GENMASK_ANY_IDENT|GENMASK_USENICK);