[srvx-commits] CVS: services/src nickserv.c,1.244,1.245 proto-bahamut.c,1.40,1.41
Brought to you by:
entrope
Menu
▾
▴
[srvx-commits] CVS: services/src nickserv.c,1.244,1.245 proto-bahamut.c,1.40,1.41
|
From: Entrope <en...@us...> - 2003-07-29 01:52:31
|
Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19265/src
Modified Files:
nickserv.c proto-bahamut.c
Log Message:
update bahamut code to new log subsystem
Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.244
retrieving revision 1.245
diff -C2 -r1.244 -r1.245
*** nickserv.c 23 Jul 2003 02:57:37 -0000 1.244
--- nickserv.c 29 Jul 2003 01:50:08 -0000 1.245
***************
*** 355,359 ****
This should be impossible, but it never hurts to expect it. */
if ((hi = dict_find(nickserv_id_dict, id_base64, NULL))) {
! log(NS_LOG, LOG_WARNING, "Duplicated account ID %lu (%s) found belonging to %s while inserting %s.", id, id_base64, hi->handle, handle);
id = 0;
}
--- 355,359 ----
This should be impossible, but it never hurts to expect it. */
if ((hi = dict_find(nickserv_id_dict, id_base64, NULL))) {
! log_module(NS_LOG, LOG_WARNING, "Duplicated account ID %lu (%s) found belonging to %s while inserting %s.", id, id_base64, hi->handle, handle);
id = 0;
}
Index: proto-bahamut.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-bahamut.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** proto-bahamut.c 22 Jul 2003 18:32:20 -0000 1.40
--- proto-bahamut.c 29 Jul 2003 01:50:11 -0000 1.41
***************
*** 119,128 ****
if (!uplink) {
! log(MAIN_LOG, LOG_WARNING, "AddUser(%p, %s, ...): server does not exist!\n", uplink, nick);
return NULL;
}
if (!is_valid_nick(nick)) {
! log(MAIN_LOG, LOG_WARNING, "AddUser(%p, %s, ...): invalid nickname detected.\n", uplink, nick);
return NULL;
}
--- 119,128 ----
if (!uplink) {
! log_module(MAIN_LOG, LOG_WARNING, "AddUser(%p, %s, ...): server does not exist!", uplink, nick);
return NULL;
}
if (!is_valid_nick(nick)) {
! log_module(MAIN_LOG, LOG_WARNING, "AddUser(%p, %s, ...): invalid nickname detected.", uplink, nick);
return NULL;
}
***************
*** 349,353 ****
/* Reconnect to the currently selected server. */
cManager.uplink->tries = 0;
! log(MAIN_LOG, LOG_INFO, "Squitting from uplink: %s\n", message);
close_socket();
}
--- 349,353 ----
/* Reconnect to the currently selected server. */
cManager.uplink->tries = 0;
! log_module(MAIN_LOG, LOG_INFO, "Squitting from uplink: %s", message);
close_socket();
}
***************
*** 427,435 ****
unsigned int len;
if (srv) {
! log(MAIN_LOG, LOG_WARNING, "%s tried to send a targeted G-line for %s (not supported by protocol!)\n", gline->issuer, gline->target);
return;
}
if (!(sep = strchr(gline->target, '@'))) {
! log(MAIN_LOG, LOG_ERROR, "%s tried to add G-line with bad mask %s\n", gline->issuer, gline->target);
return;
}
--- 427,435 ----
unsigned int len;
if (srv) {
! log_module(MAIN_LOG, LOG_WARNING, "%s tried to send a targeted G-line for %s (not supported by protocol!)", gline->issuer, gline->target);
return;
}
if (!(sep = strchr(gline->target, '@'))) {
! log_module(MAIN_LOG, LOG_ERROR, "%s tried to add G-line with bad mask %s", gline->issuer, gline->target);
return;
}
***************
*** 452,456 ****
unsigned int len;
if (!(sep = strchr(mask, '@'))) {
! log(MAIN_LOG, LOG_ERROR, "Tried to remove G-line with bad mask %s\n", mask);
return;
}
--- 452,456 ----
unsigned int len;
if (!(sep = strchr(mask, '@'))) {
! log_module(MAIN_LOG, LOG_ERROR, "Tried to remove G-line with bad mask %s", mask);
return;
}
***************
*** 599,603 ****
uplink_capab |= capabs[mm].mask;
} else {
! log(MAIN_LOG, LOG_INFO, "Saw unrecognized/unhandled capability %s. Please notify srvx developers so they can add it.", argv[nn]);
}
}
--- 599,603 ----
uplink_capab |= capabs[mm].mask;
} else {
! log_module(MAIN_LOG, LOG_INFO, "Saw unrecognized/unhandled capability %s. Please notify srvx developers so they can add it.", argv[nn]);
}
}
***************
*** 756,760 ****
/* normal JOIN */
if (!(cNode = GetChannel(argv[2]))) {
! log(MAIN_LOG, LOG_ERROR, "Unable to find SJOIN target %s\n", argv[2]);
return 0;
}
--- 756,760 ----
/* normal JOIN */
if (!(cNode = GetChannel(argv[2]))) {
! log_module(MAIN_LOG, LOG_ERROR, "Unable to find SJOIN target %s", argv[2]);
return 0;
}
***************
*** 774,778 ****
cNode = GetChannel(argv[2]);
} else {
! log(MAIN_LOG, LOG_ERROR, "Unsure how to handle SJOIN when arg 3 is %s\n", argv[3]);
return 0;
}
--- 774,778 ----
cNode = GetChannel(argv[2]);
} else {
! log_module(MAIN_LOG, LOG_ERROR, "Unsure how to handle SJOIN when arg 3 is %s", argv[3]);
return 0;
}
***************
*** 798,802 ****
if (argc < 2) {
! log(MAIN_LOG, LOG_ERROR, "Illegal MODE from %s (no arguments).\n", origin);
return 0;
} else if (IsChannelName(argv[1])) {
--- 798,802 ----
if (argc < 2) {
! log_module(MAIN_LOG, LOG_ERROR, "Illegal MODE from %s (no arguments).", origin);
return 0;
} else if (IsChannelName(argv[1])) {
***************
*** 806,810 ****
if (!(cn = GetChannel(argv[1]))) {
! log(MAIN_LOG, LOG_ERROR, "Unable to find channel %s whose mode is changing\n", argv[1]);
return 0;
}
--- 806,810 ----
if (!(cn = GetChannel(argv[1]))) {
! log_module(MAIN_LOG, LOG_ERROR, "Unable to find channel %s whose mode is changing", argv[1]);
return 0;
}
***************
*** 824,828 ****
return 1;
}
! log(MAIN_LOG, LOG_ERROR, "Not sure what MODE %s is affecting (not a channel name and no such user)\n", argv[1]);
return 0;
}
--- 824,828 ----
return 1;
}
! log_module(MAIN_LOG, LOG_ERROR, "Not sure what MODE %s is affecting (not a channel name and no such user)", argv[1]);
return 0;
}
***************
*** 832,836 ****
if (argc < 5) return 0;
if (!(cn = GetChannel(argv[1]))) {
! log(MAIN_LOG, LOG_ERROR, "Unable to find channel %s whose topic is being set\n", argv[1]);
return 0;
}
--- 832,836 ----
if (argc < 5) return 0;
if (!(cn = GetChannel(argv[1]))) {
! log_module(MAIN_LOG, LOG_ERROR, "Unable to find channel %s whose topic is being set", argv[1]);
return 0;
}
***************
*** 856,860 ****
if (!(un = GetUserH(origin))) {
! log(MAIN_LOG, LOG_ERROR, "Unable to find user %s sending AWAY\n", origin);
return 0;
}
--- 856,860 ----
if (!(un = GetUserH(origin))) {
! log_module(MAIN_LOG, LOG_ERROR, "Unable to find user %s sending AWAY", origin);
return 0;
}
***************
*** 877,881 ****
if (argc < 3) return 0;
if (!(user = GetUserH(argv[1]))) {
! log(MAIN_LOG, LOG_ERROR, "Unable to find kill victim %2\n", argv[1]);
return 0;
}
--- 877,881 ----
if (argc < 3) return 0;
if (!(user = GetUserH(argv[1]))) {
! log_module(MAIN_LOG, LOG_ERROR, "Unable to find kill victim %s", argv[1]);
return 0;
}
***************
*** 949,953 ****
desc = conf_get_data("server/description", RECDB_QSTRING);
if (!str || !desc) {
! log(MAIN_LOG, LOG_ERROR, "No server/hostname entry in config file.\n");
exit(1);
}
--- 949,953 ----
desc = conf_get_data("server/description", RECDB_QSTRING);
if (!str || !desc) {
! log_module(MAIN_LOG, LOG_ERROR, "No server/hostname entry in config file.");
exit(1);
}
***************
*** 1015,1019 ****
}
if (!res) {
! log(MAIN_LOG, LOG_ERROR, "PARSE ERROR on line: %s\n", unsplit_string(argv, argc, NULL));
} else if (!recursive) {
unsigned int i;
--- 1015,1019 ----
}
if (!res) {
! log_module(MAIN_LOG, LOG_ERROR, "PARSE ERROR on line: %s", unsplit_string(argv, argc, NULL));
} else if (!recursive) {
unsigned int i;
***************
*** 1333,1342 ****
advance_word;
if (!vic) {
! log(MAIN_LOG, LOG_ERROR, "Unable to find user with numeric %s\n", numeric);
return 0;
}
mn = GetUserMode(channel, vic);
if (!mn) {
! log(MAIN_LOG, LOG_ERROR, "Unable to find user %s in channel %s\n", vic->nick, channel->name);
return 0;
}
--- 1333,1342 ----
advance_word;
if (!vic) {
! log_module(MAIN_LOG, LOG_ERROR, "Unable to find user with numeric %s", numeric);
return 0;
}
mn = GetUserMode(channel, vic);
if (!mn) {
! log_module(MAIN_LOG, LOG_ERROR, "Unable to find user %s in channel %s", vic->nick, channel->name);
return 0;
}
|
