Просмотр исходного кода

* Removed cookie-time-slack from chanset

svn: 1796
Bryan Drewery 21 лет назад
Родитель
Сommit
7c86a1f984
6 измененных файлов с 2 добавлено и 16 удалено
  1. 1 1
      doc/UPDATES
  2. 0 2
      misc/help.txt
  3. 0 1
      src/chan.h
  4. 0 2
      src/mod/channels.mod/cmdschan.c
  5. 0 8
      src/mod/channels.mod/tclchan.c
  6. 1 2
      src/mod/channels.mod/userchan.c

+ 1 - 1
doc/UPDATES

@@ -20,6 +20,7 @@ Lines prefixxed with '-' were disabled before release and are not finishsed.
 * Fixed some botnet userfile sharing logs showing up on leaf bots.
 * Fixed some botnet userfile sharing logs showing up on leaf bots.
 * cmd_botconfig now supports wildcards for the bot parameter
 * cmd_botconfig now supports wildcards for the bot parameter
 * Eliminated a duplicate struct (conffile)
 * Eliminated a duplicate struct (conffile)
+* Removed chanset cookie-time-slack
 
 
 1.2.2
 1.2.2
 * Don't sanity check flags for users on DCC CHAT if they are on the bot via .botcmd.
 * Don't sanity check flags for users on DCC CHAT if they are on the bot via .botcmd.
@@ -116,7 +117,6 @@ Lines prefixxed with '-' were disabled before release and are not finishsed.
 * Users are no longer auto-opped on netsplit rejoin.
 * Users are no longer auto-opped on netsplit rejoin.
 * Passwords now require: 2lcase, 2ucase, 8 chars.
 * Passwords now require: 2lcase, 2ucase, 8 chars.
 * Moved config settings (bad-cookie, op-time-slack, manop, mdop, mop) to 'chanset'
 * Moved config settings (bad-cookie, op-time-slack, manop, mdop, mop) to 'chanset'
--REMOVE THIS ? * Renamed 'op-time-slack' to 'cookie-time-slack'
 * SIGHUP now restarts bot.
 * SIGHUP now restarts bot.
 * Fixed possible SEGFAULT on bot timeout.
 * Fixed possible SEGFAULT on bot timeout.
 * Sped up mode parsing
 * Sped up mode parsing

+ 0 - 2
misc/help.txt

@@ -414,8 +414,6 @@ See also: link
                           channel is set to +i. Once the channel is -i then the
                           channel is set to +i. Once the channel is -i then the
                           invite will be removed the next time the bot checks.
                           invite will be removed the next time the bot checks.
                           Please note that this is an IRCnet feature.
                           Please note that this is an IRCnet feature.
-        $bcookie-time-slack$b    How many seconds off of botnet timesync is allowed
-                                 in cookies.
      The following options chose how to respond to specific events.
      The following options chose how to respond to specific events.
         Each can be set as any of the specified options.
         Each can be set as any of the specified options.
         ignore/0           Ignore
         ignore/0           Ignore

+ 0 - 1
src/chan.h

@@ -158,7 +158,6 @@ struct chanset_t {
   int closed_private;
   int closed_private;
   int closed_invite;
   int closed_invite;
   int bad_cookie;
   int bad_cookie;
-  time_t cookie_time_slack;
   int manop;
   int manop;
   int mdop;
   int mdop;
   int mop;
   int mop;

+ 0 - 2
src/mod/channels.mod/cmdschan.c

@@ -1276,8 +1276,6 @@ static void cmd_chaninfo(int idx, char *par)
     SHOW_INT("Closed-ban: ", chan->closed_ban, NULL, "Don't!");
     SHOW_INT("Closed-ban: ", chan->closed_ban, NULL, "Don't!");
     SHOW_INT("Closed-invite:", chan->closed_invite, NULL, "Don't!");
     SHOW_INT("Closed-invite:", chan->closed_invite, NULL, "Don't!");
     SHOW_INT("Closed-Private:", chan->closed_private, NULL, "Don't!");
     SHOW_INT("Closed-Private:", chan->closed_private, NULL, "Don't!");
-    deflag = chan->cookie_time_slack;
-    SHOW_INT("Cookie-time-slack:", chan->cookie_time_slack, P_STR, "Ignore");
     SHOW_INT("Exempt-time: ", chan->exempt_time, NULL, "Forever");
     SHOW_INT("Exempt-time: ", chan->exempt_time, NULL, "Forever");
     SHOW_INT("Idle Kick after (idle-kick): ", chan->idle_kick, "", "Don't!");
     SHOW_INT("Idle Kick after (idle-kick): ", chan->idle_kick, "", "Don't!");
     SHOW_INT("Invite-time: ", chan->invite_time, NULL, "Forever");
     SHOW_INT("Invite-time: ", chan->invite_time, NULL, "Forever");

+ 0 - 8
src/mod/channels.mod/tclchan.c

@@ -433,14 +433,6 @@ int channel_modify(char *result, struct chanset_t *chan, int items, char **item)
         return ERROR;
         return ERROR;
       }
       }
       chan->bad_cookie = deflag_translate(item[i]);
       chan->bad_cookie = deflag_translate(item[i]);
-    } else if (!strcmp(item[i], "cookie_time_slack")) {
-      i++;
-      if (i >= items) {
-        if (result)
-          sprintf(result, "channel cookie-time-slack needs argument");
-        return ERROR;
-      }
-      chan->cookie_time_slack = atoi(item[i]);
     } else if (!strcmp(item[i], "manop")) {
     } else if (!strcmp(item[i], "manop")) {
       i++;
       i++;
       if (i >= items) {
       if (i >= items) {

+ 1 - 2
src/mod/channels.mod/userchan.c

@@ -997,7 +997,7 @@ bool write_chans(FILE *f, int idx)
 
 
     if (lfprintf(f, "\
     if (lfprintf(f, "\
 + channel add %s { chanmode { %s } addedby %s addedts %lu idle-kick %d \
 + channel add %s { chanmode { %s } addedby %s addedts %lu idle-kick %d \
-bad-cookie %d cookie-time-slack %lu manop %d mdop %d mop %d \
+bad-cookie %d manop %d mdop %d mop %d \
 limit %d stopnethack-mode %d revenge-mode %d flood-chan %d:%lu \
 limit %d stopnethack-mode %d revenge-mode %d flood-chan %d:%lu \
 flood-ctcp %d:%lu flood-join %d:%lu flood-kick %d:%lu flood-deop %d:%lu \
 flood-ctcp %d:%lu flood-join %d:%lu flood-kick %d:%lu flood-deop %d:%lu \
 flood-nick %d:%lu closed-ban %d closed-invite %d closed-private %d ban-time %lu \
 flood-nick %d:%lu closed-ban %d closed-invite %d closed-private %d ban-time %lu \
@@ -1016,7 +1016,6 @@ exempt-time %lu invite-time %lu \
  */
  */
 	chan->idle_kick, /* idle-kick 0 is same as dont-idle-kick (lcode)*/
 	chan->idle_kick, /* idle-kick 0 is same as dont-idle-kick (lcode)*/
 	chan->bad_cookie,
 	chan->bad_cookie,
-	chan->cookie_time_slack,
 	chan->manop,
 	chan->manop,
 	chan->mdop,
 	chan->mdop,
 	chan->mop,
 	chan->mop,