[srvx-commits] CVS: services/src tools.c,1.115,1.116 proto-p10.c,1.28,1.29 opserv.c,1.267,1.268 modu
Brought to you by:
entrope
Menu
▾
▴
[srvx-commits] CVS: services/src tools.c,1.115,1.116 proto-p10.c,1.28,1.29 opserv.c,1.267,1.268 modules.c,1.23,1.24 log.c,1.42,1.43 helpserv.c,1.30,1.31 checkdb.c,1.9,1.10
|
From: Entrope <en...@us...> - 2002-09-05 14:57:29
|
Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv1123/src
Modified Files:
tools.c proto-p10.c opserv.c modules.c log.c helpserv.c
checkdb.c
Log Message:
miscellaneous cleanups in lots of files
Index: tools.c
===================================================================
RCS file: /cvsroot/srvx/services/src/tools.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -r1.115 -r1.116
*** tools.c 15 Aug 2002 02:49:26 -0000 1.115
--- tools.c 5 Sep 2002 14:57:22 -0000 1.116
***************
*** 55,68 ****
15,16,17,18,19,20,21,22,23,24,25,62, 0,63, 0, 0,
0,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,
! 41,42,43,44,45,46,47,48,49,50,51, 0, 0, 0, 0, 0,
!
! 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
! 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
! 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
! 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
! 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
! 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
! 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
! 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
--- 55,59 ----
15,16,17,18,19,20,21,22,23,24,25,62, 0,63, 0, 0,
0,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,
! 41,42,43,44,45,46,47,48,49,50,51, 0, 0, 0, 0, 0
};
Index: proto-p10.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-p10.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** proto-p10.c 23 Aug 2002 04:49:39 -0000 1.28
--- proto-p10.c 5 Sep 2002 14:57:22 -0000 1.29
***************
*** 885,892 ****
struct server *serv;
/* new nick */
! if (argc < 9) {
! log(DEBUG_LOG, LOG_ERROR, "expected 10+ args, only got %d\n", argc);
! return 0;
! }
serv = GetServerH(origin);
if (argv[6][0] == '+') {
--- 885,889 ----
struct server *serv;
/* new nick */
! if (argc < 9) return 0;
serv = GetServerH(origin);
if (argv[6][0] == '+') {
***************
*** 894,904 ****
if (argc > 10) {
/* The user is +r and has an ACCOUNT stamp in argv[7]. */
! user = AddUser(serv, argv[1], argv[4], argv[5], argv[6], argv[9], argv[10], (time_t)atoi(argv[3]), argv[8]);
if (user) call_account_func(user, argv[7]);
} else {
! AddUser(serv, argv[1], argv[4], argv[5], argv[6], argv[8], argv[9], (time_t)atoi(argv[3]), argv[7]);
}
} else {
! AddUser(serv, argv[1], argv[4], argv[5], "+", argv[7], argv[8], (time_t)atoi(argv[3]), argv[6]);
}
}
--- 891,901 ----
if (argc > 10) {
/* The user is +r and has an ACCOUNT stamp in argv[7]. */
! user = AddUser(serv, argv[1], argv[4], argv[5], argv[6], argv[9], argv[argc-1], atoi(argv[3]), argv[8]);
if (user) call_account_func(user, argv[7]);
} else {
! AddUser(serv, argv[1], argv[4], argv[5], argv[6], argv[8], argv[argc-1], atoi(argv[3]), argv[7]);
}
} else {
! AddUser(serv, argv[1], argv[4], argv[5], "+", argv[7], argv[argc-1], atoi(argv[3]), argv[6]);
}
}
Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.267
retrieving revision 1.268
diff -C2 -r1.267 -r1.268
*** opserv.c 23 Aug 2002 04:45:40 -0000 1.267
--- opserv.c 5 Sep 2002 14:57:22 -0000 1.268
***************
*** 47,51 ****
#define KEY_DISABLED "disabled"
#define KEY_WEIGHT "weight"
- #define KEY_GLINES "glines"
#define KEY_REASON "reason"
#define KEY_RESERVES "reserves"
--- 47,50 ----
Index: modules.c
===================================================================
RCS file: /cvsroot/srvx/services/src/modules.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** modules.c 13 Aug 2002 01:13:37 -0000 1.23
--- modules.c 5 Sep 2002 14:57:22 -0000 1.24
***************
*** 42,48 ****
--- 42,56 ----
#endif
+ #ifdef WITH_MODULE_SERVERSPY
+ extern int serverspy_init(void);
+ const char *serverspy_deps[] = { NULL };
+ #endif
+
static struct cmodule cmodules[] = {
#ifdef WITH_MODULE_SNOOP
{ "snoop", snoop_init, snoop_deps, UNINIT },
+ #endif
+ #ifdef WITH_MODULE_SERVERSPY
+ { "serverspy", serverspy_init, serverspy_deps, UNINIT },
#endif
/* Placeholder at end of array */
Index: log.c
===================================================================
RCS file: /cvsroot/srvx/services/src/log.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** log.c 15 Aug 2002 03:50:09 -0000 1.42
--- log.c 5 Sep 2002 14:57:22 -0000 1.43
***************
*** 36,40 ****
{NULL, "main.log", DEFAULT_SEVERITY_MASK},
#ifdef NDEBUG
! {NULL, "debug.log", 1 << LOG_ERROR | 1 << LOG_WARNING | 1 << LOG_OTHER},
#else
{NULL, "debug.log", DEFAULT_SEVERITY_MASK},
--- 36,40 ----
{NULL, "main.log", DEFAULT_SEVERITY_MASK},
#ifdef NDEBUG
! {NULL, "debug.log", 0},
#else
{NULL, "debug.log", DEFAULT_SEVERITY_MASK},
Index: helpserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** helpserv.c 31 Aug 2002 04:21:27 -0000 1.30
--- helpserv.c 5 Sep 2002 14:57:22 -0000 1.31
***************
*** 29,37 ****
* - Statistical analysis of time
* - Setting to send all contact with users in privmsg (including greeting)
* Wishlist for helpserv.c
* - Make HelpServ send unassigned request count to helpers as they join the
* channel
* - FAQ responses
! * - Get cmd_statsreport to sort by time
* - Something for users to use a subset of commands... like closing their
* own request(s), viewing what they've sent so far, and finding their
--- 29,39 ----
* - Statistical analysis of time
* - Setting to send all contact with users in privmsg (including greeting)
+ * - cmd_close should optionally take another argument (a reason/comment)
* Wishlist for helpserv.c
* - Make HelpServ send unassigned request count to helpers as they join the
* channel
* - FAQ responses
! * - Get cmd_statsreport to sort by time and show requests closed
! * - .. then make statsreport show weighted combination of time and requests closed :)
* - Something for users to use a subset of commands... like closing their
* own request(s), viewing what they've sent so far, and finding their
Index: checkdb.c
===================================================================
RCS file: /cvsroot/srvx/services/src/checkdb.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** checkdb.c 27 Aug 2002 03:11:24 -0000 1.9
--- checkdb.c 5 Sep 2002 14:57:23 -0000 1.10
***************
*** 1,4 ****
#include "conf.h"
- #include "log.h"
#include "modcmd.h"
#include "saxdb.h"
--- 1,3 ----
|
