srvx-commits — Commit messages for srvx

[srvx-commits] CVS: services/src chanserv.c,1.324,1.325

[Miles P. <pet...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19538

Modified Files:
	chanserv.c 
Log Message:

order arguments properly to show nickname first


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.324
retrieving revision 1.325
diff -C2 -r1.324 -r1.325
*** chanserv.c	26 Dec 2002 23:53:59 -0000	1.324
--- chanserv.c	30 Dec 2002 01:10:54 -0000	1.325
***************
*** 3427,3431 ****
          if(IsOper(target))
          {
!             chanserv_notice(user, CSMSG_LAZY_SMURF_TARGET, chanserv_conf.irc_operator_epithet, target->nick);
              return 0;
          }
--- 3427,3431 ----
          if(IsOper(target))
          {
!             chanserv_notice(user, CSMSG_LAZY_SMURF_TARGET, target->nick, chanserv_conf.irc_operator_epithet);
              return 0;
          }

[srvx-commits] CVS: services/src proto-p10.c,1.50,1.51

[Adrian D. <sai...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv17020

Modified Files:
	proto-p10.c 
Log Message:
Fix a long-standing bug in cmd_burst that caused a recent crash on GamesNET


Index: proto-p10.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-p10.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** proto-p10.c	15 Dec 2002 19:44:42 -0000	1.50
--- proto-p10.c	29 Dec 2002 06:19:22 -0000	1.51
***************
*** 990,997 ****
              mode = 0;
              while ((sep = *end++)) {
!                 if ((sep == 'o') && (rel_age >= 0)) mode |= MODE_CHANOP;
!                 else if (sep == 'v') mode |= MODE_VOICE;
!                 else break;
              }
          }
          if (!(un = GetUserN(user))) {
--- 990,1000 ----
              mode = 0;
              while ((sep = *end++)) {
!                 if (sep == 'o') {
!                     mode |= MODE_CHANOP;
!                 } else if (sep == 'v') {
!                     mode |= MODE_VOICE;
!                 } else break;
              }
+             if (rel_age < 0) mode = 0;
          }
          if (!(un = GetUserN(user))) {

[srvx-commits] CVS: services/src checkdb.c,1.11,1.12

[Adrian D. <sai...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv25343

Modified Files:
	checkdb.c 
Log Message:
Make checkdb compile again


Index: checkdb.c
===================================================================
RCS file: /cvsroot/srvx/services/src/checkdb.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** checkdb.c	22 Nov 2002 04:30:48 -0000	1.11
--- checkdb.c	27 Dec 2002 04:21:44 -0000	1.12
***************
*** 55,58 ****
--- 55,62 ----
  }
  
+ void table_send(struct userNode *from, const char *to, unsigned int size, irc_send_func irc_send, struct helpfile_table table) {
+     (void)from; (void)to; (void)size; (void)irc_send; (void)table;
+ }
+ 
  /* back to our regularly scheduled code: */
  

[srvx-commits] CVS: services/src chanserv.c,1.323,1.324

[Zoot <zo...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1207/src

Modified Files:
	chanserv.c 
Log Message:
Fix the minimum parameter count for the cunsuspend command.


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.323
retrieving revision 1.324
diff -C2 -r1.323 -r1.324
*** chanserv.c	17 Dec 2002 21:00:33 -0000	1.323
--- chanserv.c	26 Dec 2002 23:53:59 -0000	1.324
***************
*** 7208,7212 ****
      DEFINE_COMMAND(move, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "template", "register", NULL);
      DEFINE_COMMAND(csuspend, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "flags", "+helping", NULL);
!     DEFINE_COMMAND(cunsuspend, 1, MODCMD_REQUIRE_AUTHED, "template", "csuspend", NULL);
      DEFINE_COMMAND(createnote, 5, 0, "access", "800", NULL);
      DEFINE_COMMAND(removenote, 2, 0, "access", "800", NULL);
--- 7208,7212 ----
      DEFINE_COMMAND(move, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "template", "register", NULL);
      DEFINE_COMMAND(csuspend, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "flags", "+helping", NULL);
!     DEFINE_COMMAND(cunsuspend, 2, MODCMD_REQUIRE_AUTHED, "template", "csuspend", NULL);
      DEFINE_COMMAND(createnote, 5, 0, "access", "800", NULL);
      DEFINE_COMMAND(removenote, 2, 0, "access", "800", NULL);

[srvx-commits] CVS: services/src helpserv.c,1.59,1.60

[Adrian D. <sai...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5242

Modified Files:
	helpserv.c 
Log Message:
Fix cmd_close to actually close requests using /msg helpserv close <nick> or /msg helpserv close *<account>


Index: helpserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -r1.59 -r1.60
*** helpserv.c	20 Dec 2002 03:36:48 -0000	1.59
--- helpserv.c	26 Dec 2002 05:06:01 -0000	1.60
***************
*** 1419,1423 ****
      struct helpserv_user *hs_user=GetHSUser(hs, user->handle_info);
      struct userNode *req_user=NULL;
!     char close_reason[MAXLEN];
      unsigned long old_req;
      unsigned int i;
--- 1419,1423 ----
      struct helpserv_user *hs_user=GetHSUser(hs, user->handle_info);
      struct userNode *req_user=NULL;
!     char close_reason[MAXLEN], reqnum[12];
      unsigned long old_req;
      unsigned int i;
***************
*** 1433,1436 ****
--- 1433,1438 ----
      }
  
+     sprintf(reqnum, "%lu", req->id);
+ 
      if (num_requests > 1) helpserv_notice(user, HSMSG_REQ_FOUNDMANY);
  
***************
*** 1464,1468 ****
      }
      helpserv_log_request(req, close_reason);
!     dict_remove(hs->requests, argv[1]);
  
      /* Look for other requests associated with them */
--- 1466,1470 ----
      }
      helpserv_log_request(req, close_reason);
!     dict_remove(hs->requests, reqnum);
  
      /* Look for other requests associated with them */

[srvx-commits] CVS: services/src nickserv.c,1.220,1.221

[Adrian D. <sai...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13582

Modified Files:
	nickserv.c 
Log Message:
Fix typo that broke nickserv flags search criteria


Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.220
retrieving revision 1.221
diff -C2 -r1.220 -r1.221
*** nickserv.c	18 Dec 2002 05:00:29 -0000	1.220
--- nickserv.c	22 Dec 2002 19:12:44 -0000	1.221
***************
*** 2653,2657 ****
              discrim->limit = atoi(argv[++i]);
          } else if (!irccasecmp(argv[i], "flags")) {
!             nickserv_modify_handle_flags(user, nickserv, argv[i], &discrim->flags_on, &discrim->flags_off);
          } else if (!irccasecmp(argv[i], "registered")) {
              const unsigned char *cmp = argv[++i];
--- 2653,2657 ----
              discrim->limit = atoi(argv[++i]);
          } else if (!irccasecmp(argv[i], "flags")) {
!             nickserv_modify_handle_flags(user, nickserv, argv[++i], &discrim->flags_on, &discrim->flags_off);
          } else if (!irccasecmp(argv[i], "registered")) {
              const unsigned char *cmp = argv[++i];

[srvx-commits] CVS: services/src saxdb.c,1.25,1.26

[Zoot <zo...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv21076/src

Modified Files:
	saxdb.c 
Log Message:
Fix periodic database writes for databases without any configuration section.


Index: saxdb.c
===================================================================
RCS file: /cvsroot/srvx/services/src/saxdb.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** saxdb.c	18 Dec 2002 19:06:11 -0000	1.25
--- saxdb.c	22 Dec 2002 00:36:16 -0000	1.26
***************
*** 95,104 ****
          str = database_get_data(conf, "frequency", RECDB_QSTRING);
          db->write_interval = str ? ParseInterval(str) : 1800;
-         if (db->write_interval && !db->mondo_section) {
-             timeq_add(now + db->write_interval, saxdb_timed_write, db);
-         }
          filename = database_get_data(conf, "filename", RECDB_QSTRING);
      } else {
          db->write_interval = 1800;
      }
      /* Insert filename */
--- 95,105 ----
          str = database_get_data(conf, "frequency", RECDB_QSTRING);
          db->write_interval = str ? ParseInterval(str) : 1800;
          filename = database_get_data(conf, "filename", RECDB_QSTRING);
      } else {
          db->write_interval = 1800;
+     }
+     /* Schedule database writes */
+     if (db->write_interval && !db->mondo_section) {
+         timeq_add(now + db->write_interval, saxdb_timed_write, db);
      }
      /* Insert filename */

[srvx-commits] CVS: services/src helpserv.c,1.58,1.59

[Adrian D. <sai...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13017

Modified Files:
	helpserv.c 
Log Message:
Place request-on-join requests in the unhandled queue in the correct order during the initial burst. Request IDs aren't rearranged, but '/msg botname next' will provide the correct order.


Index: helpserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** helpserv.c	16 Dec 2002 00:04:58 -0000	1.58
--- helpserv.c	20 Dec 2002 03:36:48 -0000	1.59
***************
*** 736,740 ****
      req->user = user;
      req->handle = user->handle_info;
!     req->opened = now;
      req->updated = now;
  
--- 736,748 ----
      req->user = user;
      req->handle = user->handle_info;
!     if (from_join && self->burst) {
!         extern time_t burst_begin;
!         /* We need to keep all the requests during a burst join together,
!          * even if the burst takes more than 1 second. ircu seems to burst
!          * in reverse-join order. */
!         req->opened = burst_begin;
!     } else {
!         req->opened = now;
!     }
      req->updated = now;
  
***************
*** 742,751 ****
          hs->unhandled = req;
          req->next_unhandled = NULL;
      } else {
!         /* Set req->next_unhandled temporarily to be the previous
!          * unhandled request, then set it null (last in list) */
!         for (req->next_unhandled = hs->unhandled; req->next_unhandled->next_unhandled; req->next_unhandled = req->next_unhandled->next_unhandled);
!         req->next_unhandled->next_unhandled = req;
          req->next_unhandled = NULL;
      }
  
--- 750,772 ----
          hs->unhandled = req;
          req->next_unhandled = NULL;
+     } else if (self->burst && hs->unhandled->opened >= req->opened) {
+         req->next_unhandled = hs->unhandled;
+         hs->unhandled = req;
+     } else if (self->burst) {
+         struct helpserv_request *unh;
+         /* Add the request to the beginning of the set of requests with
+          * req->opened having the same value. This makes reqonjoin create
+          * requests in the correct order while bursting. Note that this
+          * does not correct request ids, so they will be in reverse order
+          * though "/msg botname next" will work properly. */
+         for (unh = hs->unhandled; unh->next_unhandled && unh->next_unhandled->opened < req->opened; unh = unh->next_unhandled);
+         req->next_unhandled = unh->next_unhandled;
+         unh->next_unhandled = req;
      } else {
!         struct helpserv_request *unh;
!         /* Add to the end */
!         for (unh = hs->unhandled; unh->next_unhandled; unh = unh->next_unhandled);
          req->next_unhandled = NULL;
+         unh->next_unhandled = req;
      }
  
***************
*** 3562,3566 ****
          }
  
!         if (self->uplink->burst && !hs->req_on_join) continue;
  
          associate_requests_bybot(hs, user, 1);
--- 3583,3587 ----
          }
  
!         if (self->burst && !hs->req_on_join) continue;
  
          associate_requests_bybot(hs, user, 1);

[srvx-commits] CVS: services/src saxdb.c,1.24,1.25

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18352/src

Modified Files:
	saxdb.c 
Log Message:
initialize write_interval for DBs with no config entries
write the right part of the output buffer when write_interval==0


Index: saxdb.c
===================================================================
RCS file: /cvsroot/srvx/services/src/saxdb.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** saxdb.c	18 Dec 2002 04:44:53 -0000	1.24
--- saxdb.c	18 Dec 2002 19:06:11 -0000	1.25
***************
*** 99,102 ****
--- 99,104 ----
          }
          filename = database_get_data(conf, "filename", RECDB_QSTRING);
+     } else {
+         db->write_interval = 1800;
      }
      /* Insert filename */
***************
*** 426,430 ****
              intervalString(buf, db->write_interval);
          } else {
!             strcpy(buf+INTERVALLEN, "Never");
          }
          tbl.contents[ii][2] = buf;
--- 428,432 ----
              intervalString(buf, db->write_interval);
          } else {
!             strcpy(buf, "Never");
          }
          tbl.contents[ii][2] = buf;

[srvx-commits] CVS: services/src nickserv.c,1.219,1.220 nickserv.help.m4,1.14,1.15

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11335/src

Modified Files:
	nickserv.c nickserv.help.m4 
Log Message:
implement general comparison criteria for account registered times


Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.219
retrieving revision 1.220
diff -C2 -r1.219 -r1.220
*** nickserv.c	15 Dec 2002 10:20:31 -0000	1.219
--- nickserv.c	18 Dec 2002 05:00:29 -0000	1.220
***************
*** 2613,2617 ****
      unsigned int limit, min_level, max_level;
      unsigned long flags_on, flags_off;
!     time_t registered, lastseen;
      enum { SUBSET, EXACT, SUPERSET } hostmask_type;
      const char *nickmask;
--- 2613,2618 ----
      unsigned int limit, min_level, max_level;
      unsigned long flags_on, flags_off;
!     time_t min_registered, max_registered;
!     time_t lastseen;
      enum { SUBSET, EXACT, SUPERSET } hostmask_type;
      const char *nickmask;
***************
*** 2640,2644 ****
      discrim->max_level = ~0;
      discrim->limit = 50;
!     discrim->registered = now;
      discrim->lastseen = now;
  
--- 2641,2646 ----
      discrim->max_level = ~0;
      discrim->limit = 50;
!     discrim->min_registered = 0;
!     discrim->max_registered = INT_MAX;
      discrim->lastseen = now;
  
***************
*** 2653,2657 ****
              nickserv_modify_handle_flags(user, nickserv, argv[i], &discrim->flags_on, &discrim->flags_off);
          } else if (!irccasecmp(argv[i], "registered")) {
!             discrim->registered = now - ParseInterval(argv[++i]);
          } else if (!irccasecmp(argv[i], "seen")) {
              discrim->lastseen = now - ParseInterval(argv[++i]);
--- 2655,2676 ----
              nickserv_modify_handle_flags(user, nickserv, argv[i], &discrim->flags_on, &discrim->flags_off);
          } else if (!irccasecmp(argv[i], "registered")) {
!             const unsigned char *cmp = argv[++i];
!             if (cmp[0] == '<') {
!                 if (cmp[1] == '=') {
!                     discrim->min_registered = now - ParseInterval(cmp+2);
!                 } else {
!                     discrim->min_registered = now - ParseInterval(cmp+1) + 1;
!                 }
!             } else if (cmp[0] == '=') {
!                 discrim->min_registered = discrim->max_registered = now - ParseInterval(cmp+1);
!             } else if (cmp[0] == '>') {
!                 if (cmp[1] == '=') {
!                     discrim->max_registered = now - ParseInterval(cmp+2);
!                 } else {
!                     discrim->max_registered = now - ParseInterval(cmp+1) - 1;
!                 }
!             } else {
!                 nickserv_notice(user, MSG_INVALID_CRITERIA, cmp);
!             }
          } else if (!irccasecmp(argv[i], "seen")) {
              discrim->lastseen = now - ParseInterval(argv[++i]);
***************
*** 2703,2707 ****
                  }
              } else {
!                 nickserv_notice(user, MSG_INVALID_CRITERIA, argv[i]);
              }
          } else {
--- 2722,2726 ----
                  }
              } else {
!                 nickserv_notice(user, MSG_INVALID_CRITERIA, cmp);
              }
          } else {
***************
*** 2721,2725 ****
      if (((discrim->flags_on & hi->flags) != discrim->flags_on)
          || (discrim->flags_off & hi->flags)
!         || (discrim->registered < hi->registered)
          || (discrim->lastseen < (hi->users?now:hi->lastseen))
          || (discrim->handlemask && !match_ircglob(hi->handle, discrim->handlemask))
--- 2740,2745 ----
      if (((discrim->flags_on & hi->flags) != discrim->flags_on)
          || (discrim->flags_off & hi->flags)
!         || (discrim->min_registered > hi->registered)
!         || (discrim->max_registered < hi->registered)
          || (discrim->lastseen < (hi->users?now:hi->lastseen))
          || (discrim->handlemask && !match_ircglob(hi->handle, discrim->handlemask))

Index: nickserv.help.m4
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.help.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** nickserv.help.m4	12 Nov 2002 19:09:23 -0000	1.14
--- nickserv.help.m4	18 Dec 2002 05:00:31 -0000	1.15
***************
*** 253,257 ****
          "  LIMIT      - Limits the number of matches",
          "  FLAGS      - Bits that must be turned on (e.g. +h) and/or off (e.g. -S) in an account",
!         "  REGISTERED - Accounts registered at least this long ago",
          "  SEEN       - Accounts not seen for at least this long",
          "  ACCOUNTMASK - A glob that must match the account name",
--- 253,257 ----
          "  LIMIT      - Limits the number of matches",
          "  FLAGS      - Bits that must be turned on (e.g. +h) and/or off (e.g. -S) in an account",
!         "  REGISTERED - Registered time constraint (<Nu, <=Nu, =Nu, >=Nu or >Nu)",
          "  SEEN       - Accounts not seen for at least this long",
          "  ACCOUNTMASK - A glob that must match the account name",

[srvx-commits] CVS: services/src opserv.c,1.298,1.299

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv7405/src

Modified Files:
	opserv.c 
Log Message:
do not use the unsplit_string() buffer for every discrim's reason


Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.298
retrieving revision 1.299
diff -C2 -r1.298 -r1.299
*** opserv.c	17 Dec 2002 20:25:20 -0000	1.298
--- opserv.c	18 Dec 2002 04:45:21 -0000	1.299
***************
*** 358,361 ****
--- 358,362 ----
      free(alert->text_discrim);
      free(alert->split_discrim);
+     free(alert->discrim->reason);
      free(alert->discrim);
      free(alert);
***************
*** 2475,2479 ****
      alert->split_discrim = discrim_copy;
      name_dup = strdup(name);
!     if (!alert->discrim->reason) alert->discrim->reason = name_dup;
      alert->reaction = reaction;
      dict_insert(opserv_user_alerts, name_dup, alert);
--- 2476,2480 ----
      alert->split_discrim = discrim_copy;
      name_dup = strdup(name);
!     if (!alert->discrim->reason) alert->discrim->reason = strdup(name);
      alert->reaction = reaction;
      dict_insert(opserv_user_alerts, name_dup, alert);
***************
*** 2908,2912 ****
  	    discrim->limit = strtoul(argv[++i], NULL, 10);
          } else if (irccasecmp(argv[i], "reason") == 0) {
!             discrim->reason = unsplit_string(argv+i+1, argc-i-1, NULL);
              i = argc;
          } else if (irccasecmp(argv[i], "last") == 0) {
--- 2909,2913 ----
  	    discrim->limit = strtoul(argv[++i], NULL, 10);
          } else if (irccasecmp(argv[i], "reason") == 0) {
!             discrim->reason = strdup(unsplit_string(argv+i+1, argc-i-1, NULL));
              i = argc;
          } else if (irccasecmp(argv[i], "last") == 0) {
***************
*** 3287,3290 ****
--- 3288,3292 ----
      }
  
+     free(das.discrim->reason);
      free(das.discrim);
      dict_delete(das.dict);

[srvx-commits] CVS: services/src saxdb.c,1.23,1.24

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv7266/src

Modified Files:
	saxdb.c 
Log Message:
add a "?stats databases"


Index: saxdb.c
===================================================================
RCS file: /cvsroot/srvx/services/src/saxdb.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** saxdb.c	14 Dec 2002 02:07:22 -0000	1.23
--- saxdb.c	18 Dec 2002 04:44:53 -0000	1.24
***************
*** 20,23 ****
--- 20,24 ----
  
  #include "conf.h"
+ #include "hash.h"
  #include "modcmd.h"
  #include "saxdb.h"
***************
*** 400,403 ****
--- 401,452 ----
  }
  
+ static MODCMD_FUNC(cmd_stats_databases) {
+     struct helpfile_table tbl;
+     dict_iterator_t it;
+     unsigned int ii;
+ 
+     (void)argv;
+     tbl.length = dict_size(saxdbs) + 1;
+     tbl.width = 5;
+     tbl.flags = TABLE_NO_FREE;
+     tbl.contents = calloc(tbl.length, sizeof(tbl.contents[0]));
+     tbl.contents[0] = calloc(tbl.width, sizeof(tbl.contents[0][0]));
+     tbl.contents[0][0] = "Database";
+     tbl.contents[0][1] = "Filename/Section";
+     tbl.contents[0][2] = "Interval";
+     tbl.contents[0][3] = "Last Written";
+     tbl.contents[0][4] = "Last Duration";
+     for (ii=1, it=dict_first(saxdbs); it; it=iter_next(it), ++ii) {
+         struct saxdb *db = iter_data(it);
+         char *buf = malloc(INTERVALLEN*3);
+         tbl.contents[ii] = calloc(tbl.width, sizeof(tbl.contents[ii][0]));
+         tbl.contents[ii][0] = db->name;
+         tbl.contents[ii][1] = db->mondo_section ? db->mondo_section : db->filename;
+         if (db->write_interval) {
+             intervalString(buf, db->write_interval);
+         } else {
+             strcpy(buf+INTERVALLEN, "Never");
+         }
+         tbl.contents[ii][2] = buf;
+         if (db->last_write) {
+             intervalString(buf+INTERVALLEN, now - db->last_write);
+             intervalString(buf+INTERVALLEN*2, db->last_write_duration);
+         } else {
+             strcpy(buf+INTERVALLEN, "Never");
+             strcpy(buf+INTERVALLEN*2, "Never");
+         }
+         tbl.contents[ii][3] = buf+INTERVALLEN;
+         tbl.contents[ii][4] = buf+INTERVALLEN*2;
+     }
+     table_send(cmd->parent->bot, user->nick, 0, 0, tbl);
+     free(tbl.contents[0]);
+     for (ii=1; ii<tbl.length; ++ii) {
+         free((char*)tbl.contents[ii][2]);
+         free(tbl.contents[ii]);
+     }
+     free(tbl.contents);
+     return 0;
+ }
+ 
  static void
  saxdb_cleanup(void) {
***************
*** 438,441 ****
--- 487,491 ----
      modcmd_register(saxdb_module, "write", cmd_write, 2, MODCMD_REQUIRE_AUTHED, "access", "800", NULL);
      modcmd_register(saxdb_module, "writeall", cmd_writeall, 0, MODCMD_REQUIRE_AUTHED, "access", "800", NULL);
+     modcmd_register(saxdb_module, "stats databases", cmd_stats_databases, 0, 0, NULL);
  }
  

[srvx-commits] CVS: services/src chanserv.c,1.322,1.323

[Zoot <zo...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5565/src

Modified Files:
	chanserv.c 
Log Message:
Fix ChanServ double-freeing greetings.


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.322
retrieving revision 1.323
diff -C2 -r1.322 -r1.323
*** chanserv.c	17 Dec 2002 20:26:51 -0000	1.322
--- chanserv.c	17 Dec 2002 21:00:33 -0000	1.323
***************
*** 5141,5146 ****
      {
          char *greeting = unsplit_string(argv+1, argc-1, NULL);
  
!         free(*data);
  	if(greeting[0] == '*' && greeting[1] == 0)
  	{
--- 5141,5147 ----
      {
          char *greeting = unsplit_string(argv+1, argc-1, NULL);
+         char *previous;
  
!         previous = *data;
  	if(greeting[0] == '*' && greeting[1] == 0)
  	{
***************
*** 5160,5163 ****
--- 5161,5168 ----
  	    *data = strdup(greeting);
  	}
+         if(previous)
+         {
+             free(previous);
+         }
      }
  

[srvx-commits] CVS: services/src chanserv.c,1.321,1.322

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv24141/src

Modified Files:
	chanserv.c 
Log Message:
make cunsuspend only look at argv for a channel name
fix cunsuspend's min_argc


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.321
retrieving revision 1.322
diff -C2 -r1.321 -r1.322
*** chanserv.c	17 Dec 2002 19:16:17 -0000	1.321
--- chanserv.c	17 Dec 2002 20:26:51 -0000	1.322
***************
*** 4823,4842 ****
      char message[MAXLEN];
  
!     if(!channel && argc < 2)
!     {
! 	chanserv_notice(user, MSG_INVALID_CHANNEL);
! 	return 0;
!     }
! 
!     if(channel)
!     {
! 	if(!channel->channel_info || !IsSuspended(channel->channel_info))
! 	{
! 	    chanserv_notice(user, CSMSG_NOT_SUSPENDED, channel->name);
! 	    return 0;
! 	}
! 	suspended = channel->channel_info->suspended;
!     }
!     else if(!(suspended = dict_find(sChannels, argv[1], NULL)))
      {
          chanserv_notice(user, CSMSG_NOT_SUSPENDED, argv[1]);
--- 4823,4827 ----
      char message[MAXLEN];
  
!     if(!(suspended = dict_find(sChannels, argv[1], NULL)))
      {
          chanserv_notice(user, CSMSG_NOT_SUSPENDED, argv[1]);
***************
*** 7218,7222 ****
      DEFINE_COMMAND(move, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "template", "register", NULL);
      DEFINE_COMMAND(csuspend, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "flags", "+helping", NULL);
!     DEFINE_COMMAND(cunsuspend, 2, MODCMD_REQUIRE_AUTHED, "template", "csuspend", NULL);
      DEFINE_COMMAND(createnote, 5, 0, "access", "800", NULL);
      DEFINE_COMMAND(removenote, 2, 0, "access", "800", NULL);
--- 7203,7207 ----
      DEFINE_COMMAND(move, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "template", "register", NULL);
      DEFINE_COMMAND(csuspend, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "flags", "+helping", NULL);
!     DEFINE_COMMAND(cunsuspend, 1, MODCMD_REQUIRE_AUTHED, "template", "csuspend", NULL);
      DEFINE_COMMAND(createnote, 5, 0, "access", "800", NULL);
      DEFINE_COMMAND(removenote, 2, 0, "access", "800", NULL);

[srvx-commits] CVS: services/src heap.c,1.21,1.22

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv23862/src

Modified Files:
	heap.c 
Log Message:
remove pointless typecast


Index: heap.c
===================================================================
RCS file: /cvsroot/srvx/services/src/heap.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** heap.c	15 Aug 2002 03:50:09 -0000	1.21
--- heap.c	17 Dec 2002 20:26:13 -0000	1.22
***************
*** 83,87 ****
      if (heap->data_used == heap->data_alloc) {
  	heap->data_alloc *= 2;
! 	heap->data = (void**)realloc(heap->data, 2*heap->data_alloc*sizeof(void*));
      }
      heap->data[heap->data_used*2] = key;
--- 83,87 ----
      if (heap->data_used == heap->data_alloc) {
  	heap->data_alloc *= 2;
! 	heap->data = realloc(heap->data, 2*heap->data_alloc*sizeof(void*));
      }
      heap->data[heap->data_used*2] = key;

[srvx-commits] CVS: services/src modcmd.c,1.45,1.46

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv23690/src

Modified Files:
	modcmd.c 
Log Message:
tweak log output so it uses nick!ident@host instead of nick/ident@host


Index: modcmd.c
===================================================================
RCS file: /cvsroot/srvx/services/src/modcmd.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** modcmd.c	17 Dec 2002 19:24:04 -0000	1.45
--- modcmd.c	17 Dec 2002 20:25:56 -0000	1.46
***************
*** 688,692 ****
          pos += sprintf(logbuf+pos, "[%s", user->nick);
          if (cmd->flags & MODCMD_LOG_HOSTMASK) {
!             pos += sprintf(logbuf+pos, "/%s@%s/%ld.%ld.%ld.%ld", user->ident, user->hostname, (user->ip >> 24) & 255, (user->ip >> 16) & 255, (user->ip >> 8) & 255, user->ip & 255);
          }
          if (user->handle_info) {
--- 688,692 ----
          pos += sprintf(logbuf+pos, "[%s", user->nick);
          if (cmd->flags & MODCMD_LOG_HOSTMASK) {
!             pos += sprintf(logbuf+pos, "!%s@%s/%ld.%ld.%ld.%ld", user->ident, user->hostname, (user->ip >> 24) & 255, (user->ip >> 16) & 255, (user->ip >> 8) & 255, user->ip & 255);
          }
          if (user->handle_info) {

[srvx-commits] CVS: services/src opserv.c,1.297,1.298

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv23409/src

Modified Files:
	opserv.c 
Log Message:
send a debug notice when removing someone from a bad-word channel


Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.297
retrieving revision 1.298
diff -C2 -r1.297 -r1.298
*** opserv.c	14 Dec 2002 14:38:49 -0000	1.297
--- opserv.c	17 Dec 2002 20:25:20 -0000	1.298
***************
*** 160,163 ****
--- 160,164 ----
  #define OSMSG_NICK_UNRESERVED	"No longer reserving nick $b%s$b."
  #define OSMSG_NOT_RESERVED	"Nick $b%s$b is not reserved."
+ #define OSMSG_ILLEGAL_CHANNEL_USER "Found $b%s$b in bad-word channel $b%s$b; removing the user."
  #define OSMSG_ILLEGAL_REASON    "This channel is illegal."
  #define OSMSG_ILLEGAL_KILL_REASON "Joined an illegal modeless channel - do not repeat."
***************
*** 1864,1867 ****
--- 1865,1869 ----
  
      if (channel->bad_channel) {
+         opserv_debug(OSMSG_ILLEGAL_CHANNEL_USER, user->nick, channel->name);
          if (channel->name[0] == '#') {
              if (!GetUserMode(channel, opserv)) {

[srvx-commits] CVS: services/src tools.c,1.119,1.120

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv23195/src

Modified Files:
	tools.c 
Log Message:
accept more strings as host names in hostmasks, since accounts can
  have those characters


Index: tools.c
===================================================================
RCS file: /cvsroot/srvx/services/src/tools.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -r1.119 -r1.120
*** tools.c	22 Nov 2002 04:29:46 -0000	1.119
--- tools.c	17 Dec 2002 20:24:56 -0000	1.120
***************
*** 338,342 ****
      while (*text && *text != '@' && !isspace((unsigned char)*text)) text++;
      if (*text++ != '@') return 0;
!     while (*text && (isalnum((unsigned char)*text) || strchr(".-?*", *text))) text++;
      return !*text;
  }
--- 338,342 ----
      while (*text && *text != '@' && !isspace((unsigned char)*text)) text++;
      if (*text++ != '@') return 0;
!     while (*text && !isspace((unsigned char)*text)) text++;
      return !*text;
  }

[srvx-commits] CVS: services/src proto-common.c,1.23,1.24

[Zoot <zo...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv7564/src

Modified Files:
	proto-common.c 
Log Message:
Ignore remote whois queries from non-opers on hidden host clients (not applicable to GamesNET because remote whois is disabled for users).


Index: proto-common.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-common.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** proto-common.c	22 Nov 2002 04:29:46 -0000	1.23
--- proto-common.c	17 Dec 2002 19:49:13 -0000	1.24
***************
*** 370,383 ****
          return 0;
      }
!     if ((who = GetUserH(argv[2]))) {
!         irc_numeric(from, RPL_WHOISUSER, "%s %s %s * :%s", who->nick, who->ident, who->hostname, who->info);
!         irc_numeric(from, RPL_WHOISSERVER, "%s %s :%s", who->nick, who->uplink->name, who->uplink->description);
!         if (IsOper(who)) {
!             irc_numeric(from, RPL_WHOISOPERATOR, "%s :is a megalomaniacal power hungry tyrant", who->nick);
!         }
!         irc_numeric(from, RPL_ENDOFWHOIS, "%s :End of /WHOIS list", who->nick);
!     } else {
          irc_numeric(from, ERR_NOSUCHNICK, "%s@%s :No such nick", argv[2], self->name);
      }
      return 1;
  }
--- 370,388 ----
          return 0;
      }
!     if(!(who = GetUserH(argv[2])))
!     {
          irc_numeric(from, ERR_NOSUCHNICK, "%s@%s :No such nick", argv[2], self->name);
+         return 1;
      }
+     if (IsHiddenHost(who) && !IsOper(from)) {
+         /* Just stay quiet. */
+         return 1;
+     }
+     irc_numeric(from, RPL_WHOISUSER, "%s %s %s * :%s", who->nick, who->ident, who->hostname, who->info);
+     irc_numeric(from, RPL_WHOISSERVER, "%s %s :%s", who->nick, who->uplink->name, who->uplink->description);
+     if (IsOper(who)) {
+         irc_numeric(from, RPL_WHOISOPERATOR, "%s :is a megalomaniacal power hungry tyrant", who->nick);
+     }
+     irc_numeric(from, RPL_ENDOFWHOIS, "%s :End of /WHOIS list", who->nick);
      return 1;
  }

[srvx-commits] CVS: services/src modcmd.c,1.44,1.45

[Zoot <zo...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv30859/src

Modified Files:
	modcmd.c 
Log Message:
Silently ignore lines like "!!" and other obvious non-commands; fix a small crash bug.


Index: modcmd.c
===================================================================
RCS file: /cvsroot/srvx/services/src/modcmd.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** modcmd.c	15 Dec 2002 10:30:03 -0000	1.44
--- modcmd.c	17 Dec 2002 19:24:04 -0000	1.45
***************
*** 594,597 ****
--- 594,601 ----
          return 0;
      }
+     if(!isalnum(*argv[cmd_arg])) {
+         /* Silently ignore stuff that doesn't begin with a letter or number. */
+         return 0;
+     }
      cmd = dict_find(service->commands, argv[cmd_arg], NULL);
      if (!cmd) {
***************
*** 766,770 ****
      }
      argc = split_line(text, false, ArrayLength(argv), argv);
!     return svccmd_invoke_argv(user, service, channel, argc, argv, server_qualified);
  }
  
--- 770,774 ----
      }
      argc = split_line(text, false, ArrayLength(argv), argv);
!     return argc ? svccmd_invoke_argv(user, service, channel, argc, argv, server_qualified) : 0;
  }
  

[srvx-commits] CVS: services/src chanserv.c,1.320,1.321

[Zoot <zo...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28431/src

Modified Files:
	chanserv.c 
Log Message:
Fix a tiny memory leak.


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.320
retrieving revision 1.321
diff -C2 -r1.320 -r1.321
*** chanserv.c	17 Dec 2002 05:41:12 -0000	1.320
--- chanserv.c	17 Dec 2002 19:16:17 -0000	1.321
***************
*** 7171,7174 ****
--- 7171,7175 ----
      if(chanserv_conf.set_shows) free_string_list(chanserv_conf.set_shows);
      if(set_shows_list.list) free(set_shows_list.list);
+     if(uset_shows_list.list) free(uset_shows_list.list);
      while(helperList)
      {

[srvx-commits] CVS: services/src chanserv.c,1.319,1.320

[Zoot <zo...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv32394/src

Modified Files:
	chanserv.c 
Log Message:
Fix a small crash bug in the !access command.


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.319
retrieving revision 1.320
diff -C2 -r1.319 -r1.320
*** chanserv.c	15 Dec 2002 23:01:25 -0000	1.319
--- chanserv.c	17 Dec 2002 05:41:12 -0000	1.320
***************
*** 3473,3476 ****
--- 3473,3482 ----
      }
  
+     if(!channel->channel_info)
+     {
+         chanserv_notice(user, CSMSG_NOT_REGISTERED, channel->name);
+         return 1;
+     }
+ 
      helping = HANDLE_FLAGGED(target_handle, HELPING)
          && ((target_handle->opserv_level > 0) || !IsProtected(channel->channel_info));

[srvx-commits] CVS: services/src helpserv.c,1.57,1.58

[Adrian D. <sai...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv2124

Modified Files:
	helpserv.c 
Log Message:
Don't say "has no full helpers present because <a trial> has left"


Index: helpserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** helpserv.c	15 Dec 2002 21:45:54 -0000	1.57
--- helpserv.c	16 Dec 2002 00:04:58 -0000	1.58
***************
*** 3362,3366 ****
              }
  
!             if (hs->intervals[INTERVAL_EMPTY_INTERVAL]) {
                  int num_trials;
                  if ((num_trials = find_helpchan_helpers(hs)) >= 0) {
--- 3362,3366 ----
              }
  
!             if (hs->intervals[INTERVAL_EMPTY_INTERVAL] && hs_user->level >= HlHelper) {
                  int num_trials;
                  if ((num_trials = find_helpchan_helpers(hs)) >= 0) {

[srvx-commits] CVS: services/src chanserv.c,1.318,1.319

[Zoot <zo...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv17843/src

Modified Files:
	chanserv.c 
Log Message:
Fix a bug in suspension history display.


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.318
retrieving revision 1.319
diff -C2 -r1.318 -r1.319
*** chanserv.c	15 Dec 2002 10:29:59 -0000	1.318
--- chanserv.c	15 Dec 2002 23:01:25 -0000	1.319
***************
*** 4090,4093 ****
--- 4090,4094 ----
          intervalString(buf2, now-suspended->revoked);
          chanserv_notice(user, CSMSG_CHANNEL_SUSPENDED_7, buf1, suspended->suspender, buf2, suspended->reason);
+         break;
      default:
          log(CS_LOG, LOG_ERROR, "Invalid combo value %d in show_suspension_info()\n", combo);
***************
*** 4111,4115 ****
      {
          cData = channel->channel_info;
!         sChan = NULL;
      }
      else if(argc > 1)
--- 4112,4116 ----
      {
          cData = channel->channel_info;
!         sChan = cData->suspended;
      }
      else if(argc > 1)

[srvx-commits] CVS: services/src helpserv.c,1.56,1.57

[Adrian D. <sai...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv24084

Modified Files:
	helpserv.c 
Log Message:
Always record helpers as joining (even during the initial burst) to make sure their time is properly credited.


Index: helpserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** helpserv.c	15 Dec 2002 06:41:38 -0000	1.56
--- helpserv.c	15 Dec 2002 21:45:54 -0000	1.57
***************
*** 3547,3554 ****
          struct helpserv_bot *hs=botlist->list[i];
  
-         if (self->uplink->burst && !hs->req_on_join) continue;
- 
-         associate_requests_bybot(hs, user, 1);
- 
          if (user->handle_info) {
              struct helpserv_user *hs_user;
--- 3547,3550 ----
***************
*** 3565,3568 ****
--- 3561,3568 ----
              }
          }
+ 
+         if (self->uplink->burst && !hs->req_on_join) continue;
+ 
+         associate_requests_bybot(hs, user, 1);
  
          helpserv_message(hs, user, MSGTYPE_GREETING);