[srvx-commits] CVS: services/src sendmail.help,NONE,1.1 tools.c,1.114,1.115 sendmail.h,1.2,1.3 sendmail.c,1.3,1.4 opserv.c,1.263,1.264 modcmd.c,1.16,1.17 mod-snoop.c,1.1,1.2 main.c,1.132,1.133 helpserv.c,1.24,1.25 globtest.c,1.4,1.5 expnhelp.c,1.4,1.5 Makefile.am,1.52,1.53 mini-tools.c,1.3,NONE

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

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv1548/src

Modified Files:
	tools.c sendmail.h sendmail.c opserv.c modcmd.c mod-snoop.c 
	main.c helpserv.c globtest.c expnhelp.c Makefile.am 
Added Files:
	sendmail.help 
Removed Files:
	mini-tools.c 
Log Message:
rearrange utility programs to remove (need for) mini-tools.c
remove extra #include's from helpserv.c and modcmd.c
don't let compiler think snoop_conf_read() is varadic
move sendmail control commands from opserv.c to sendmail.c (and opserv.db to sendmail.db)
move set_policer_param() into main.c to remove tools.c -> policer.c dependency


--- NEW FILE ---
"BANEMAIL" ("/msg $S BANEMAIL <address> <reason>",
        "Keeps srvx from sending mail to the address.  The address may be a real address, or a glob that uses * and ? wildcards.",
        "This also prevents anyone from using matching addresses as their account email address.",
        "$uSee Also:$u unbanemail");
"UNBANEMAIL" ("/msg $S UNBANEMAIL <address>",
        "Removes an email address (or glob) from the banned email address list.",
        "$uSee Also:$u banemail");

Index: tools.c
===================================================================
RCS file: /cvsroot/srvx/services/src/tools.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -r1.114 -r1.115
*** tools.c	14 Aug 2002 20:25:08 -0000	1.114
--- tools.c	15 Aug 2002 02:49:26 -0000	1.115
***************
*** 765,777 ****
  }
  
- int
- set_policer_param(const char *param, void *data, void *extra)
- {
-     struct record_data *rd = data;
-     const char *str = GET_RECORD_QSTRING(rd);
-     if (str) policer_params_set(extra, param, str);
-     return 0;
- }
- 
  DEFINE_LIST(string_buffer, char)
  
--- 765,768 ----

Index: sendmail.h
===================================================================
RCS file: /cvsroot/srvx/services/src/sendmail.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** sendmail.h	6 May 2002 23:33:12 -0000	1.2
--- sendmail.h	15 Aug 2002 02:49:26 -0000	1.3
***************
*** 22,36 ****
  #define SENDMAIL_H
  
! /* These are exported just because OpServ would otherwise need three
!  * or so functions to access them.  Yay for not having real modules.
!  * email addresses are looked up literally in prohibited_addrs, and
!  * compared against globs in prohibited_masks.  Both map from address
!  * string/glob to explanation.
!  */
! extern dict_t prohibited_addrs, prohibited_masks;
! 
  void sendmail(struct userNode *from, struct handle_info *to, const char *subject, const char *body, int first_time);
  const char *sendmail_prohibited_address(const char *addr);
- void sendmail_init(void);
  
  #endif
--- 22,28 ----
  #define SENDMAIL_H
  
! void sendmail_init(void);
  void sendmail(struct userNode *from, struct handle_info *to, const char *subject, const char *body, int first_time);
  const char *sendmail_prohibited_address(const char *addr);
  
  #endif

Index: sendmail.c
===================================================================
RCS file: /cvsroot/srvx/services/src/sendmail.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** sendmail.c	30 Jul 2002 02:15:11 -0000	1.3
--- sendmail.c	15 Aug 2002 02:49:26 -0000	1.4
***************
*** 20,24 ****
  
  #include "conf.h"
! #include "log.h"
  #include "nickserv.h"
  
--- 20,24 ----
  
  #include "conf.h"
! #include "modcmd.h"
  #include "nickserv.h"
  
***************
*** 27,31 ****
  #endif
  
! dict_t prohibited_addrs, prohibited_masks;
  
  const char *
--- 27,42 ----
  #endif
  
! #define KEY_PROHIBITED   "prohibited"
! #define SENDMAIL_DB_NAME "sendmail.db"
! #define TEMP_DB_NAME     "sendmail.db.new"
! 
! #define MODMSG_EMAIL_ALREADY_BANNED "%s is already banned (%s)."
! #define MODMSG_EMAIL_BANNED         "Email to %s has been forbidden."
! #define MODMSG_EMAIL_NOT_BANNED     "Email to %s was not forbidden."
! #define MODMSG_EMAIL_UNBANNED       "Email to %s is now allowed."
! #define MODMSG_PROHIBITED_EMAIL     "%s: %s"
! 
! static dict_t prohibited_addrs, prohibited_masks;
! struct module *sendmail_module;
  
  const char *
***************
*** 152,156 ****
          if (!fromaddr) fromaddr = "ad...@po...";
          fprintf(out, "From: %s <%s>\n", from->nick, fromaddr);
!         fprintf(out, "To: %s <%s>\n", to->handle, to->email_addr);
          fprintf(out, "Subject: %s\n", subject);
  
--- 163,167 ----
          if (!fromaddr) fromaddr = "ad...@po...";
          fprintf(out, "From: %s <%s>\n", from->nick, fromaddr);
!         fprintf(out, "To: \"%s\" <%s>\n", to->handle, to->email_addr);
          fprintf(out, "Subject: %s\n", subject);
  
***************
*** 211,214 ****
--- 222,314 ----
  }
  
+ static int
+ sendmail_ban_address(struct userNode *user, struct userNode *bot, const char *addr, const char *reason) {
+     dict_t target;
+     const char *str;
+ 
+     target = strpbrk(addr, "*?") ? prohibited_masks : prohibited_addrs;
+         if ((str = dict_find(target, addr, NULL))) {
+         if (user) send_message(user, bot, MODMSG_EMAIL_ALREADY_BANNED, addr, str);
+         return 0;
+     }
+     dict_insert(target, strdup(addr), strdup(reason));
+     if (user) send_message(user, bot, MODMSG_EMAIL_BANNED, addr);
+     return 1;
+ }
+ 
+ static MODCMD_FUNC(cmd_banemail) {
+     char *reason = unsplit_string(argv+2, argc-2, NULL);
+     return sendmail_ban_address(user, cmd->parent->bot, argv[1], reason);
+ }
+ 
+ static MODCMD_FUNC(cmd_unbanemail) {
+     dict_t target;
+     const char *addr;
+ 
+     addr = argv[1];
+     target = strpbrk(addr, "*?") ? prohibited_masks : prohibited_addrs;
+     if (dict_remove(target, addr)) {
+         send_message(user, cmd->parent->bot, MODMSG_EMAIL_UNBANNED, addr);
+     } else {
+         send_message(user, cmd->parent->bot, MODMSG_EMAIL_NOT_BANNED, addr);
+     }
+     return 1;
+ }
+ 
+ static MODCMD_FUNC(cmd_stats_email) {
+     dict_iterator_t it;
+ 
+     (void)argv;
+     for (it=dict_first(prohibited_addrs); it; it=iter_next(it)) {
+         send_message(user, cmd->parent->bot, MODMSG_PROHIBITED_EMAIL, iter_key(it), (const char*)iter_data(it));
+     }
+     for (it=dict_first(prohibited_masks); it; it=iter_next(it)) {
+         send_message(user, cmd->parent->bot, MODMSG_PROHIBITED_EMAIL, iter_key(it), (const char*)iter_data(it));
+     }
+     return 0;
+ }
+ 
+ static void
+ sendmail_db_read(void) {
+     dict_t db, subdb;
+     dict_iterator_t it;
+     struct record_data *rd;
+ 
+     if (!(db = parse_database(SENDMAIL_DB_NAME))) return;
+     if ((subdb = database_get_data(db, KEY_PROHIBITED, RECDB_OBJECT))) {
+         for (it = dict_first(subdb); it; it = iter_next(it)) {
+             rd = iter_data(it);
+             if (rd->type == RECDB_QSTRING) {
+                 sendmail_ban_address(NULL, NULL, iter_key(it), rd->d.qstring);
+             }
+         }
+     }
+     free_database(db);
+ }
+ 
+ static void
+ sendmail_db_write(void) {
+     FILE *f;
+     dict_t db, subdb;
+     dict_iterator_t it;
+ 
+     db = alloc_database();
+     subdb = alloc_object();
+     for (it = dict_first(prohibited_masks); it; it = iter_next(it)) {
+         dict_insert(subdb, iter_key(it), alloc_record_data_qstring(iter_data(it)));
+     }
+     for (it = dict_first(prohibited_addrs); it; it = iter_next(it)) {
+         dict_insert(subdb, iter_key(it), alloc_record_data_qstring(iter_data(it)));
+     }
+     dict_insert(db, KEY_PROHIBITED, alloc_record_data_object(subdb));
+     f = fopen(TEMP_DB_NAME, "w+");
+     write_database(f, db);
+     fclose(f);
+     free_database(db);
+     if (rename(TEMP_DB_NAME, SENDMAIL_DB_NAME) == -1) {
+         log(MAIN_LOG, LOG_ERROR, "Unable to rename new db to old: %s\n", strerror(errno));
+     }
+ }
+ 
  static void
  sendmail_cleanup(void)
***************
*** 228,230 ****
--- 328,336 ----
      dict_set_free_data(prohibited_masks, free);
      reg_exit_func(sendmail_cleanup);
+     sendmail_module = module_register("sendmail", MAIN_LOG, "sendmail.help", NULL);
+     modcmd_register(sendmail_module, "banemail", cmd_banemail, 3, 0, "access", 601, NULL);
+     modcmd_register(sendmail_module, "stats email", cmd_stats_email, 0, 0, "flags", "+oper", NULL);
+     modcmd_register(sendmail_module, "unbanemail", cmd_unbanemail, 2, 0, "access", 601, NULL);
+     reg_db_write_func(sendmail_db_write);
+     sendmail_db_read();
  }

Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.263
retrieving revision 1.264
diff -C2 -r1.263 -r1.264
*** opserv.c	14 Aug 2002 21:55:49 -0000	1.263
--- opserv.c	15 Aug 2002 02:49:26 -0000	1.264
***************
*** 30,34 ****
  #include "timeq.h"
  #include "sockcheck.h"
- #include "sendmail.h"
  
  #ifdef HAVE_NETINET_IN_H
--- 30,33 ----
***************
*** 45,49 ****
  #define OPSERV_DB_NAME "opserv.db"
  #define TEMP_DB_NAME "opserv.db.new"
- #define OPSERV_HELPFILE_NAME "opserv.help"
  
  #define KEY_ALERT_CHANNEL "alert_channel"
--- 44,47 ----
***************
*** 77,81 ****
  #define KEY_DISCRIM "discrim"
  #define KEY_WARN "chanwarn"
- #define KEY_EMAIL_BANS "email_bans"
  #define KEY_MAX "max"
  #define KEY_TIME "time"
--- 75,78 ----
***************
*** 158,162 ****
  #define OSMSG_BADWORD_LIST      "Bad words: %s"
  #define OSMSG_EXEMPTED_LIST     "Exempted channels: %s"
- #define OSMSG_PROHIBITED_EMAIL  "%s: %s"
  #define OSMSG_GLINE_COUNT       "There are %d glines active on the network."
  #define OSMSG_LINKS_SERVER      "%s%s (%u clients; %s)"
--- 155,158 ----
***************
*** 249,256 ****
  #define OSMSG_MODLOG_PASSED     "Logging modification succeeded."
  #define OSMSG_LOG_SEVERITIES    "Logged severities for %s: %s"
- #define OSMSG_EMAIL_ALREADY_BANNED "%s is already banned (%s)."
- #define OSMSG_EMAIL_BANNED      "Email to %s has been forbidden."
- #define OSMSG_EMAIL_NOT_BANNED  "Email to %s was not forbidden."
- #define OSMSG_EMAIL_UNBANNED    "Email to %s is now allowed."
  #define OSMSG_WARN_ADDED	"Added channel activity warning for $b%s$b (%s)"
  #define OSMSG_WARN_EXISTS	"Channel activity warning for $b%s$b already exists."
--- 245,248 ----
***************
*** 1360,1376 ****
  
  static void
- cmd_stats_email(struct userNode *user)
- {
-     dict_iterator_t it;
- 
-     for (it=dict_first(prohibited_addrs); it; it=iter_next(it)) {
-         opserv_notice(user, OSMSG_PROHIBITED_EMAIL, iter_key(it), (const char*)iter_data(it));
-     }
-     for (it=dict_first(prohibited_masks); it; it=iter_next(it)) {
-         opserv_notice(user, OSMSG_PROHIBITED_EMAIL, iter_key(it), (const char*)iter_data(it));
-     }
- }
- 
- static void
  cmd_stats_glines(struct userNode *user)
  {
--- 1352,1355 ----
***************
*** 1650,1656 ****
  {
      OPSERV_MIN_PARMS(2, false);
      if (!irccasecmp(argv[1], "alerts")) cmd_stats_alerts(user);
      else if (!irccasecmp(argv[1], "bad")) cmd_stats_bad(user);
-     else if (!irccasecmp(argv[1], "email")) cmd_stats_email(user);
      else if (!irccasecmp(argv[1], "gags")) cmd_stats_gags(user);
      else if (!irccasecmp(argv[1], "glines")) cmd_stats_glines(user);
--- 1629,1635 ----
  {
      OPSERV_MIN_PARMS(2, false);
+ 
      if (!irccasecmp(argv[1], "alerts")) cmd_stats_alerts(user);
      else if (!irccasecmp(argv[1], "bad")) cmd_stats_bad(user);
      else if (!irccasecmp(argv[1], "gags")) cmd_stats_gags(user);
      else if (!irccasecmp(argv[1], "glines")) cmd_stats_glines(user);
***************
*** 2456,2497 ****
  }
  
- static int
- opserv_ban_email(struct userNode *user, const char *addr, const char *reason)
- {
-     dict_t target;
-     const char *str;
- 
-     target = strpbrk(addr, "*?") ? prohibited_masks : prohibited_addrs;
-     if ((str = dict_find(target, addr, NULL))) {
-         if (user) opserv_notice(user, OSMSG_EMAIL_ALREADY_BANNED, addr, str);
-         return 0;
-     }
-     dict_insert(target, strdup(addr), strdup(reason));
-     if (user) opserv_notice(user, OSMSG_EMAIL_BANNED, addr);
-     return 1;
- }
- 
- static OPSERV_FUNC(cmd_ban_email)
- {
-     OPSERV_MIN_PARMS(3, 0);
-     return opserv_ban_email(user, argv[1], unsplit_string(argv+2, argc-2, NULL));
- }
- 
- static OPSERV_FUNC(cmd_unban_email)
- {
-     dict_t target;
-     const char *addr;
- 
-     OPSERV_MIN_PARMS(2, 0);
-     addr = argv[1];
-     target = strpbrk(addr, "*?") ? prohibited_masks : prohibited_addrs;
-     if (dict_remove(target, addr)) {
-         opserv_notice(user, OSMSG_EMAIL_UNBANNED, addr);
-     } else {
-         opserv_notice(user, OSMSG_EMAIL_NOT_BANNED, addr);
-     }
-     return 1;
- }
- 
  struct modcmd *
  opserv_define_func(const char *name, modcmd_func_t *func, int min_level, int reqchan)
--- 2435,2438 ----
***************
*** 2756,2770 ****
  }
  
- static int
- add_email_ban(const char *key, void *data, void *extra)
- {
-     struct record_data *rd = data;
- 
-     (void)extra;
-     if (rd->type != RECDB_QSTRING) return 0;
-     opserv_ban_email(NULL, key, rd->d.qstring);
-     return 0;
- }
- 
  static void
  opserv_db_read(void)
--- 2697,2700 ----
***************
*** 2854,2860 ****
          dict_foreach(object, add_chan_warn, NULL);
      }
-     if ((object = database_get_data(conf_db, KEY_EMAIL_BANS, RECDB_OBJECT))) {
-         dict_foreach(object, add_email_ban, NULL);
-     }
      free_database(conf_db);
  }
--- 2784,2787 ----
***************
*** 2947,2957 ****
  }
  
- static int
- email_ban_write(const char *key, void *data, void *extra)
- {
-     dict_insert(extra, key, alloc_record_data_qstring(data));
-     return 0;
- }
- 
  static void
  max_clients_write(void *extra)
--- 2874,2877 ----
***************
*** 3002,3010 ****
      dict_foreach(opserv_user_alerts, user_alert_write, subdb);
      dict_insert(db, KEY_ALERTS, alloc_record_data_object(subdb));
-     /* banned email addresses */
-     subdb = alloc_object();
-     dict_foreach(prohibited_addrs, email_ban_write, subdb);
-     dict_foreach(prohibited_masks, email_ban_write, subdb);
-     dict_insert(db, KEY_EMAIL_BANS, alloc_record_data_object(subdb));
      /* max clients */
      subdb = alloc_object(); 
--- 2922,2925 ----
***************
*** 3017,3021 ****
      free_database(db);
      if (rename(TEMP_DB_NAME, OPSERV_DB_NAME) == -1) {
!         log(NS_LOG, LOG_ERROR, "unable to rename new db to old: %s\n", strerror(errno));
      }
      last_db_write = now;
--- 2932,2936 ----
      free_database(db);
      if (rename(TEMP_DB_NAME, OPSERV_DB_NAME) == -1) {
!         log(OS_LOG, LOG_ERROR, "unable to rename new db to old: %s\n", strerror(errno));
      }
      last_db_write = now;
***************
*** 4377,4381 ****
  
      memset(level_strings, 0, sizeof(level_strings));
!     opserv_module = module_register("OpServ", OS_LOG, OPSERV_HELPFILE_NAME, opserv_help_expand);
      opserv_define_func("ACCESS", cmd_access, 0, 0);
      opserv_define_func("ADDALERT", cmd_addalert, 800, 0);
--- 4292,4296 ----
  
      memset(level_strings, 0, sizeof(level_strings));
!     opserv_module = module_register("OpServ", OS_LOG, "opserv.help", opserv_help_expand);
      opserv_define_func("ACCESS", cmd_access, 0, 0);
      opserv_define_func("ADDALERT", cmd_addalert, 800, 0);
***************
*** 4387,4391 ****
      opserv_define_func("ADDTRUST", cmd_addtrust, 800, 0);
      opserv_define_func("BAN", cmd_ban, 100, 2);
-     opserv_define_func("BANEMAIL", cmd_ban_email, 601, 0);
      opserv_define_func("BLOCK", cmd_block, 100, 0);
      opserv_define_func("CHANINFO", cmd_chaninfo, 0, 3);
--- 4302,4305 ----
***************
*** 4448,4452 ****
      opserv_define_func("GTRACE", cmd_gtrace, 100, 0);
      opserv_define_func("UNBAN", cmd_unban, 100, 2);
-     opserv_define_func("UNBANEMAIL", cmd_unban_email, 601, 0);
      opserv_define_func("UNGAG", cmd_ungag, 600, 0);
      opserv_define_func("UNGLINE", cmd_ungline, 600, 0);
--- 4362,4365 ----

Index: modcmd.c
===================================================================
RCS file: /cvsroot/srvx/services/src/modcmd.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** modcmd.c	7 Aug 2002 01:44:30 -0000	1.16
--- modcmd.c	15 Aug 2002 02:49:26 -0000	1.17
***************
*** 23,27 ****
  #include "conf.h"
  #include "policer.h"
- #include "recdb.h"
  
  #define TEMP_DB_NAME "modcmd.db.tmp"
--- 23,26 ----

Index: mod-snoop.c
===================================================================
RCS file: /cvsroot/srvx/services/src/mod-snoop.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mod-snoop.c	13 Aug 2002 01:13:37 -0000	1.1
--- mod-snoop.c	15 Aug 2002 02:49:26 -0000	1.2
***************
*** 85,89 ****
  
  static void
! snoop_conf_read() {
      dict_t node;
      char *str;
--- 85,89 ----
  
  static void
! snoop_conf_read(void) {
      dict_t node;
      char *str;

Index: main.c
===================================================================
RCS file: /cvsroot/srvx/services/src/main.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -r1.132 -r1.133
*** main.c	11 Aug 2002 03:26:16 -0000	1.132
--- main.c	15 Aug 2002 02:49:26 -0000	1.133
***************
*** 475,478 ****
--- 475,487 ----
  }
  
+ int
+ set_policer_param(const char *param, void *data, void *extra)
+ {
+     struct record_data *rd = data;
+     const char *str = GET_RECORD_QSTRING(rd);
+     if (str) policer_params_set(extra, param, str);
+     return 0;
+ }
+ 
  static void
  conf_globals(void)

Index: helpserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** helpserv.c	13 Aug 2002 03:04:07 -0000	1.24
--- helpserv.c	15 Aug 2002 02:49:26 -0000	1.25
***************
*** 49,53 ****
  
  #include "conf.h"
- #include "dict.h"
  #include "global.h"
  #include "helpfile.h"
--- 49,52 ----

Index: globtest.c
===================================================================
RCS file: /cvsroot/srvx/services/src/globtest.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** globtest.c	30 Jul 2002 02:15:11 -0000	1.4
--- globtest.c	15 Aug 2002 02:49:26 -0000	1.5
***************
*** 1,2 ****
--- 1,3 ----
+ #include "hash.h"
  #include "log.h"
  #include "policer.h"
***************
*** 73,96 ****
  }
  
! /* crap, it's all crap. */
! 
! DEFINE_LIST(userList, struct userNode*);
! 
! struct userList curr_opers;
! unsigned int invis_clients;
! struct policer_params *oper_policer_params, *luser_policer_params;
! 
! void
! log(enum log_type lt, enum log_severity ls, char *format, ...) {
!     va_list args;
      (void)lt; (void)ls;
!     va_start(args, format);
!     vfprintf(stdout, format, args);
!     va_end(args);
! }
! 
! int
! policer_params_set(struct policer_params *params, const char *param, const char *value) {
!     (void)params; (void)param; (void)value;
!     return 0;
  }
--- 74,84 ----
  }
  
! /* because tools.c likes to log stuff.. */
! void log(enum log_type lt, enum log_severity ls, char *format, ...)
! {
!     va_list va;
      (void)lt; (void)ls;
!     va_start(va, format);
!     vfprintf(stderr, format, va);
!     va_end(va);
  }

Index: expnhelp.c
===================================================================
RCS file: /cvsroot/srvx/services/src/expnhelp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** expnhelp.c	30 Jul 2002 02:15:11 -0000	1.4
--- expnhelp.c	15 Aug 2002 02:49:26 -0000	1.5
***************
*** 2,22 ****
  #include "recdb.h"
  
! /* arghhhh */
! time_t now;
! int silent = 1;
! void reg_exit_func(exit_func_t handler) {
!     (void)handler;
! }
! int match_ircglob(const char *text, const char *glob) {
!     (void)text; (void)glob;
!     return 0;
! }
! int send_message(struct userNode *dest, struct userNode *src, const char *message, ...) {
!     (void)dest; (void)src; (void)message;
!     return 0;
  }
  
- /* Back to our regularly scheduled programming.. */
- 
  struct string_list *new_argv;
  
--- 2,15 ----
  #include "recdb.h"
  
! /* because recdb likes to log stuff.. */
! void log(enum log_type lt, enum log_severity ls, char *format, ...)
! {
!     va_list va;
!     (void)lt; (void)ls;
!     va_start(va, format);
!     vfprintf(stderr, format, va);
!     va_end(va);
  }
  
  struct string_list *new_argv;
  
***************
*** 65,70 ****
  
      tools_init();
-     init_logs();
-     time(&now);
      new_argv = alloc_string_list(4);
      string_list_append(new_argv, strdup("m4"));
--- 58,61 ----

Index: Makefile.am
===================================================================
RCS file: /cvsroot/srvx/services/src/Makefile.am,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** Makefile.am	11 Aug 2002 03:26:16 -0000	1.52
--- Makefile.am	15 Aug 2002 02:49:26 -0000	1.53
***************
*** 4,9 ****
  noinst_PROGRAMS = srvx expnhelp
  EXTRA_PROGRAMS = checkdb globtest
! EXTRA_DIST = nickserv.help.m4 global.help opserv.help chanserv.help helpserv.help
! noinst_DATA = global.help nickserv.help opserv.help chanserv.help helpserv.help
  nickserv.help: nickserv.help.m4 expnhelp
  	./expnhelp < $(srcdir)/nickserv.help.m4 > $@
--- 4,9 ----
  noinst_PROGRAMS = srvx expnhelp
  EXTRA_PROGRAMS = checkdb globtest
! EXTRA_DIST = nickserv.help.m4 global.help opserv.help chanserv.help helpserv.help sendmail.help
! noinst_DATA = global.help nickserv.help opserv.help chanserv.help helpserv.help sendmail.help
  nickserv.help: nickserv.help.m4 expnhelp
  	./expnhelp < $(srcdir)/nickserv.help.m4 > $@
***************
*** 41,48 ****
  	tools.c
  
! expnhelp_SOURCES = expnhelp.c compat.c compat.h common.h dict-splay.c dict.h recdb.c recdb.h log.c log.h mini-tools.c
! checkdb_SOURCES = checkdb.c recdb.c recdb.h dict-splay.c dict.h log.h mini-tools.c
! 
! globtest_SOURCES = tools.c globtest.c common.h dict-splay.c dict.h mini-tools.c
! globtest_CFLAGS = -DGLOBTEST
! 
--- 41,45 ----
  	tools.c
  
! expnhelp_SOURCES = common.h compat.c compat.h dict-splay.c dict.h expnhelp.c log.h recdb.c recdb.h tools.c
! checkdb_SOURCES = checkdb.c common.h compat.c compat.h dict-splay.c dict.h log.h recdb.c recdb.h tools.c
! globtest_SOURCES = common.h compat.c compat.h dict-splay.c dict.h globtest.c tools.c

--- mini-tools.c DELETED ---