[srvx-commits] CVS: services/src nickserv.c,1.197,1.198

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

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

Modified Files:
	nickserv.c 
Log Message:
warn when unable to read in a database that user asked us to merge


Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.197
retrieving revision 1.198
diff -C2 -r1.197 -r1.198
*** nickserv.c	18 Aug 2002 05:50:24 -0000	1.197
--- nickserv.c	20 Aug 2002 02:47:15 -0000	1.198
***************
*** 23,27 ****
  #include "global.h"
  #include "modcmd.h"
! #include "opserv.h"
  #include "policer.h"
  #include "saxdb.h"
--- 23,27 ----
  #include "global.h"
  #include "modcmd.h"
! #include "opserv.h" /* for gag_create() */
  #include "policer.h"
  #include "saxdb.h"
***************
*** 200,205 ****
  #define NSMSG_SET_FLAG		"Applied flags $b%s$b to %s's $N account."
  #define NSMSG_USER_FLAGS	"User $b%s$b has flags $b%s$b set."
! #define NSMSG_WRITE_SUCCESS	"$N db write completed (in "FMT_TIME_T".%03lu seconds)."
! #define NSMSG_READHELP_SUCCESS	"$N help file completed (in "FMT_TIME_T".%03lu seconds)."
  #define NSMSG_DB_MERGED         "$N merged DB from %s (in "FMT_TIME_T".%03lu seconds)."
  #define NSMSG_HANDLE_CHANGED	"$b%s$b's account name has been changed to $b%s$b."
--- 200,204 ----
  #define NSMSG_SET_FLAG		"Applied flags $b%s$b to %s's $N account."
  #define NSMSG_USER_FLAGS	"User $b%s$b has flags $b%s$b set."
! #define NSMSG_DB_UNREADABLE     "Unable to read database file %s; check the log for more information."
  #define NSMSG_DB_MERGED         "$N merged DB from %s (in "FMT_TIME_T".%03lu seconds)."
  #define NSMSG_HANDLE_CHANGED	"$b%s$b's account name has been changed to $b%s$b."
***************
*** 2834,2838 ****
      gettimeofday(&start, NULL);
      if (!(db = parse_database(argv[1]))) {
!         /* TODO: warn of failure */
          return 0;
      }
--- 2833,2837 ----
      gettimeofday(&start, NULL);
      if (!(db = parse_database(argv[1]))) {
!         nickserv_notice(user, NSMSG_DB_UNREADABLE, argv[1]);
          return 0;
      }