/* nickserv.c - Nick/authentication service
* Copyright 2000-2004 srvx Development Team
*
- * This program is free software; you can redistribute it and/or modify
+ * This file is part of srvx.
+ *
+ * srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version. Important limitations are
- * listed in the COPYING file that accompanies this software.
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, email srvx-maintainers@srvx.net.
+ * along with srvx; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
#include "chanserv.h"
{ "NSMSG_MUST_TIME_OUT", "You must wait for cookies of that type to time out." },
{ "NSMSG_ATE_COOKIE", "I ate the cookie for your account. You may now have another." },
{ "NSMSG_USE_RENAME", "You are already authenticated to account $b%s$b -- contact the support staff to rename your account." },
+ { "NSMSG_ALREADY_REGISTERING", "You have already used $bREGISTER$b once this session; you may not use it again." },
{ "NSMSG_REGISTER_BAD_NICKMASK", "Could not recognize $b%s$b as either a current nick or a hostmask." },
{ "NSMSG_NICK_NOT_REGISTERED", "Nick $b%s$b has not been registered to any account." },
{ "NSMSG_HANDLE_NOT_FOUND", "Could not find your account -- did you register yet?" },
{ "NSMSG_ALREADY_AUTHED", "You are already authed to account $b%s$b; you must reconnect to auth to a different account." },
- { "NSMSG_USE_AUTHCOOKIE", "Your hostmask is not valid for account $b%s$b. Please use the $bauthcookie$b command to grant yourself access. (/msg $S authcookie %s)" },
+ { "NSMSG_USE_AUTHCOOKIE", "Your hostmask is not valid for account $b%1$s$b. Please use the $bauthcookie$b command to grant yourself access. (/msg $S authcookie %1$s)" },
{ "NSMSG_HOSTMASK_INVALID", "Your hostmask is not valid for account $b%s$b." },
{ "NSMSG_USER_IS_SERVICE", "$b%s$b is a network service; you can only use that command on real users." },
{ "NSMSG_USER_PREV_AUTH", "$b%s$b is already authenticated." },
{ "NSMSG_CLONE_AUTH", "Warning: %s (%s@%s) authed to your account." },
{ "NSMSG_SETTING_LIST", "$b$N account settings:$b" },
{ "NSMSG_INVALID_OPTION", "$b%s$b is an invalid account setting." },
- { "NSMSG_INVALID_ANNOUNCE", "$b%s$b is an announcements value." },
+ { "NSMSG_INVALID_ANNOUNCE", "$b%s$b is an invalid announcements value." },
{ "NSMSG_SET_INFO", "$bINFO: $b%s" },
{ "NSMSG_SET_WIDTH", "$bWIDTH: $b%d" },
{ "NSMSG_SET_TABLEWIDTH", "$bTABLEWIDTH: $b%d" },
{ "NSMSG_SET_LEVEL", "$bLEVEL: $b%d" },
{ "NSMSG_SET_EPITHET", "$bEPITHET: $b%s" },
{ "NSEMAIL_ACTIVATION_SUBJECT", "Account verification for %s" },
- { "NSEMAIL_ACTIVATION_BODY", "This email has been sent to verify that this email address belongs to the person who tried to register an account on %1$s. Your cookie is:\n %2$s\nTo verify your email address and complete the account registration, log on to %1$s and type the following command:\n /msg %3$s@%4$s COOKIE %5$s %2$s\nIf you did NOT request this account, you do not need to do anything. Please contact the %1$s staff if you have questions." },
+ { "NSEMAIL_ACTIVATION_BODY", "This email has been sent to verify that this email address belongs to the person who tried to register an account on %1$s. Your cookie is:\n %2$s\nTo verify your email address and complete the account registration, log on to %1$s and type the following command:\n /msg %3$s@%4$s COOKIE %5$s %2$s\nThis command is only used once to complete your account registration, and never again. Once you have run this command, you will need to authenticate everytime you reconnect to the network. To do this, you will have to type this command every time you reconnect:\n /msg %3$s@%4$s AUTH %1$s your-password\n Please remember to fill in 'your-password' with the actual password you gave to us when you registered.\n\nIf you did NOT request this account, you do not need to do anything. Please contact the %1$s staff if you have questions, and be sure to check our website." },
{ "NSEMAIL_PASSWORD_CHANGE_SUBJECT", "Password change verification on %s" },
{ "NSEMAIL_PASSWORD_CHANGE_BODY", "This email has been sent to verify that you wish to change the password on your account %5$s. Your cookie is %2$s.\nTo complete the password change, log on to %1$s and type the following command:\n /msg %3$s@%4$s COOKIE %5$s %2$s\nIf you did NOT request your password to be changed, you do not need to do anything. Please contact the %1$s staff if you have questions." },
{ "NSEMAIL_EMAIL_CHANGE_SUBJECT", "Email address change verification for %s" },
{ "NSEMAIL_EMAIL_CHANGE_BODY_NEW", "This email has been sent to verify that your email address belongs to the same person as account %5$s on %1$s. The SECOND HALF of your cookie is %2$.*6$s.\nTo verify your address as associated with this account, log on to %1$s and type the following command:\n /msg %3$s@%4$s COOKIE %5$s ?????%2$.*6$s\n(Replace the ????? with the FIRST HALF of the cookie, as sent to your OLD email address.)\nIf you did NOT request this email address to be associated with this account, you do not need to do anything. Please contact the %1$s staff if you have questions." },
{ "NSEMAIL_EMAIL_CHANGE_BODY_OLD", "This email has been sent to verify that you want to change your email for account %5$s on %1$s from this address to %7$s. The FIRST HALF of your cookie is %2$.*6$s\nTo verify your new address as associated with this account, log on to %1$s and type the following command:\n /msg %3$s@%4$s COOKIE %5$s %2$.*6$s?????\n(Replace the ????? with the SECOND HALF of the cookie, as sent to your NEW email address.)\nIf you did NOT request this change of email address, you do not need to do anything. Please contact the %1$s staff if you have questions." },
{ "NSEMAIL_EMAIL_VERIFY_SUBJECT", "Email address verification for %s" },
- { "NSEMAIL_EMAIL_VERIFY_BODY", "This email has been sent to verify that this address belongs to the same person as %5$s on %1$s. Your cookie is %2$s.\nTo verify your address as associated with this account, log on to %1$s and type the following command:\n /msg %3$s@%4$s COOKIE %5$s %1$s\nIf you did NOT request this email address to be associated with this account, you do not need to do anything. Please contact the %1$s staff if you have questions." },
+ { "NSEMAIL_EMAIL_VERIFY_BODY", "This email has been sent to verify that this address belongs to the same person as %5$s on %1$s. Your cookie is %2$s.\nTo verify your address as associated with this account, log on to %1$s and type the following command:\n /msg %3$s@%4$s COOKIE %5$s %2$s\nIf you did NOT request this email address to be associated with this account, you do not need to do anything. Please contact the %1$s staff if you have questions." },
{ "NSEMAIL_ALLOWAUTH_SUBJECT", "Authentication allowed for %s" },
- { "NSEMAIL_ALLOWAUTH_BODY", "This email has been sent to let you authenticate (auth) to account %5$s on %1$s. Your cookie is %2$s.\nTo auth to that account, log on to %1$s and type the following command:\n /msg %3$s@%4$s COOKIE %5$s %1$s\nIf you did NOT request this authorization, you do not need to do anything. Please contact the %1$s staff if you have questions." },
+ { "NSEMAIL_ALLOWAUTH_BODY", "This email has been sent to let you authenticate (auth) to account %5$s on %1$s. Your cookie is %2$s.\nTo auth to that account, log on to %1$s and type the following command:\n /msg %3$s@%4$s COOKIE %5$s %2$s\nIf you did NOT request this authorization, you do not need to do anything. Please contact the %1$s staff if you have questions." },
{ "CHECKPASS_YES", "Yes." },
{ "CHECKPASS_NO", "No." },
{ NULL, NULL }
return 0;
}
if (IsLocal(target)) {
- send_message(user, service, "NSMSG_USER_IS_SERVICE", target->nick);
+ if (IsService(target))
+ send_message(user, service, "NSMSG_USER_IS_SERVICE", target->nick);
+ else
+ send_message(user, service, "MSG_USER_AUTHENTICATE", target->nick);
return 0;
}
if (!(hi = target->handle_info)) {
hi = register_handle(handle, crypted, 0);
hi->masks = alloc_string_list(1);
hi->users = NULL;
+ hi->language = lang_C;
hi->registered = now;
hi->lastseen = now;
hi->flags = HI_DEFAULT_FLAGS;
case ACTIVATION:
hi->passwd[0] = 0; /* invalidate password */
send_message(user, nickserv, "NSMSG_USE_COOKIE_REGISTER");
- fmt = user_find_message(user, "NSEMAIL_ACTIVATION_SUBJECT");
+ fmt = handle_find_message(hi, "NSEMAIL_ACTIVATION_SUBJECT");
snprintf(subject, sizeof(subject), fmt, netname);
- fmt = user_find_message(user, "NSEMAIL_ACTIVATION_BODY");
+ fmt = handle_find_message(hi, "NSEMAIL_ACTIVATION_BODY");
snprintf(body, sizeof(body), fmt, netname, cookie->cookie, nickserv->nick, self->name, hi->handle);
first_time = 1;
break;
case PASSWORD_CHANGE:
send_message(user, nickserv, "NSMSG_USE_COOKIE_RESETPASS");
- fmt = user_find_message(user, "NSEMAIL_PASSWORD_CHANGE_SUBJECT");
+ fmt = handle_find_message(hi, "NSEMAIL_PASSWORD_CHANGE_SUBJECT");
snprintf(subject, sizeof(subject), fmt, netname);
- fmt = user_find_message(user, "NSEMAIL_PASSWORD_CHANGE_BODY");
+ fmt = handle_find_message(hi, "NSEMAIL_PASSWORD_CHANGE_BODY");
snprintf(body, sizeof(body), fmt, netname, cookie->cookie, nickserv->nick, self->name, hi->handle);
break;
case EMAIL_CHANGE:
hi->email_addr = cookie->data;
if (misc) {
send_message(user, nickserv, "NSMSG_USE_COOKIE_EMAIL_2");
- fmt = user_find_message(user, "NSEMAIL_EMAIL_CHANGE_SUBJECT");
+ fmt = handle_find_message(hi, "NSEMAIL_EMAIL_CHANGE_SUBJECT");
snprintf(subject, sizeof(subject), fmt, netname);
- fmt = user_find_message(user, "NSEMAIL_EMAIL_CHANGE_BODY_NEW");
+ fmt = handle_find_message(hi, "NSEMAIL_EMAIL_CHANGE_BODY_NEW");
snprintf(body, sizeof(body), fmt, netname, cookie->cookie+COOKIELEN/2, nickserv->nick, self->name, hi->handle, COOKIELEN/2);
sendmail(nickserv, hi, subject, body, 1);
- fmt = user_find_message(user, "NSEMAIL_EMAIL_CHANGE_BODY_OLD");
- snprintf(body, sizeof(body), fmt, netname, cookie->cookie+COOKIELEN/2, nickserv->nick, self->name, hi->handle, COOKIELEN/2, hi->email_addr);
+ fmt = handle_find_message(hi, "NSEMAIL_EMAIL_CHANGE_BODY_OLD");
+ snprintf(body, sizeof(body), fmt, netname, cookie->cookie, nickserv->nick, self->name, hi->handle, COOKIELEN/2, hi->email_addr);
} else {
send_message(user, nickserv, "NSMSG_USE_COOKIE_EMAIL_1");
- fmt = user_find_message(user, "NSEMAIL_EMAIL_VERIFY_SUBJECT");
+ fmt = handle_find_message(hi, "NSEMAIL_EMAIL_VERIFY_SUBJECT");
snprintf(subject, sizeof(subject), fmt, netname);
- fmt = user_find_message(user, "NSEMAIL_EMAIL_VERIFY_BODY");
+ fmt = handle_find_message(hi, "NSEMAIL_EMAIL_VERIFY_BODY");
snprintf(body, sizeof(body), fmt, netname, cookie->cookie, nickserv->nick, self->name, hi->handle);
sendmail(nickserv, hi, subject, body, 1);
subject[0] = 0;
hi->email_addr = misc;
break;
case ALLOWAUTH:
- fmt = user_find_message(user, "NSEMAIL_ALLOWAUTH_SUBJECT");
+ fmt = handle_find_message(hi, "NSEMAIL_ALLOWAUTH_SUBJECT");
snprintf(subject, sizeof(subject), fmt, netname);
- fmt = user_find_message(user, "NSEMAIL_ALLOWAUTH_BODY");
+ fmt = handle_find_message(hi, "NSEMAIL_ALLOWAUTH_BODY");
snprintf(body, sizeof(body), fmt, netname, cookie->cookie, nickserv->nick, self->name, hi->handle);
+ send_message(user, nickserv, "NSMSG_USE_COOKIE_AUTH");
break;
default:
log_module(NS_LOG, LOG_ERROR, "Bad cookie type %d in nickserv_make_cookie.", cookie->type);
return 0;
}
+ if (IsRegistering(user)) {
+ reply("NSMSG_ALREADY_REGISTERING");
+ return 0;
+ }
+
if (IsStamped(user)) {
/* Unauthenticated users might still have been stamped
previously and could therefore have a hidden host;
if (no_auth)
nickserv_make_cookie(user, hi, ACTIVATION, hi->passwd);
+ /* Set registering flag.. */
+ user->modes |= FLAGS_REGISTERING;
+
return 1;
}
reply("NSMSG_HANDLEINFO_REGGED", ctime(&hi->registered));
if (!hi->users) {
- intervalString(buff, now - hi->lastseen);
+ intervalString(buff, now - hi->lastseen, user->handle_info);
reply("NSMSG_HANDLEINFO_LASTSEEN", buff);
} else {
reply("NSMSG_HANDLEINFO_LASTSEEN_NOW");
reply("NSMSG_HANDLE_NOT_FOUND");
return 0;
}
+ /* Responses from here on look up the language used by the handle they asked about. */
passwd = argv[pw_arg];
if (!valid_user_for(user, hi)) {
if (hi->email_addr && nickserv_conf.email_enabled)
- reply("NSMSG_USE_AUTHCOOKIE", hi->handle, hi->handle);
+ send_message_type(4, user, cmd->parent->bot,
+ handle_find_message(hi, "NSMSG_USE_AUTHCOOKIE"),
+ hi->handle);
else
- reply("NSMSG_HOSTMASK_INVALID", hi->handle);
+ send_message_type(4, user, cmd->parent->bot,
+ handle_find_message(hi, "NSMSG_HOSTMASK_INVALID"),
+ hi->handle);
argv[pw_arg] = "BADMASK";
return 1;
}
if (!checkpass(passwd, hi->passwd)) {
unsigned int n;
- reply("NSMSG_PASSWORD_INVALID");
+ send_message_type(4, user, cmd->parent->bot,
+ handle_find_message(hi, "NSMSG_PASSWORD_INVALID"));
argv[pw_arg] = "BADPASS";
for (n=0; n<failpw_func_used; n++) failpw_func_list[n](user, hi);
if (nickserv_conf.autogag_enabled) {
return 1;
}
if (HANDLE_FLAGGED(hi, SUSPENDED)) {
- reply("NSMSG_HANDLE_SUSPENDED");
+ send_message_type(4, user, cmd->parent->bot,
+ handle_find_message(hi, "NSMSG_HANDLE_SUSPENDED"));
argv[pw_arg] = "SUSPENDED";
return 1;
}
maxlogins = hi->maxlogins ? hi->maxlogins : nickserv_conf.default_maxlogins;
for (used = 0, other = hi->users; other; other = other->next_authed) {
if (++used >= maxlogins) {
- reply("NSMSG_MAX_LOGINS", maxlogins);
+ send_message_type(4, user, cmd->parent->bot,
+ handle_find_message(hi, "NSMSG_MAX_LOGINS"),
+ maxlogins);
argv[pw_arg] = "MAXLOGINS";
return 1;
}
}
+ set_user_handle_info(user, hi, 1);
if (nickserv_conf.email_required && !hi->email_addr)
reply("NSMSG_PLEASE_SET_EMAIL");
if (!is_secure_password(hi->handle, passwd, NULL))
reply("NSMSG_WEAK_PASSWORD");
if (hi->passwd[0] != '$')
cryptpass(passwd, hi->passwd);
-
reply("NSMSG_AUTH_SUCCESS");
argv[pw_arg] = "****";
- set_user_handle_info(user, hi, 1);
return 1;
}
return 0;
}
nickserv_make_cookie(user, hi, ALLOWAUTH, NULL);
- reply("NSMSG_USE_COOKIE_AUTH");
return 1;
}
unsigned int i;
char *set_display[] = {
"INFO", "WIDTH", "TABLEWIDTH", "COLOR", "PRIVMSG", "STYLE",
- "EMAIL", "ANNOUNCEMENTS", "MAXLOGINS"
+ "EMAIL", "ANNOUNCEMENTS", "MAXLOGINS", "LANGUAGE"
};
send_message(user, nickserv, "NSMSG_SETTING_LIST");
static OPTION_FUNC(opt_width)
{
- if (argc > 1) {
- unsigned int new_width = strtoul(argv[1], NULL, 0);
- hi->screen_width = new_width;
- }
+ if (argc > 1)
+ hi->screen_width = strtoul(argv[1], NULL, 0);
if ((hi->screen_width > 0) && (hi->screen_width < MIN_LINE_SIZE))
hi->screen_width = MIN_LINE_SIZE;
static OPTION_FUNC(opt_tablewidth)
{
- if (argc > 1) {
- unsigned int new_width = strtoul(argv[1], NULL, 0);
- hi->table_width = new_width;
- }
+ if (argc > 1)
+ hi->table_width = strtoul(argv[1], NULL, 0);
if ((hi->table_width > 0) && (hi->table_width < MIN_LINE_SIZE))
hi->table_width = MIN_LINE_SIZE;
switch (hi->announcements) {
case 'y': choice = user_find_message(user, "MSG_ON"); break;
- case 'n': choice = user_find_message(user, "MSG_ON"); break;
+ case 'n': choice = user_find_message(user, "MSG_OFF"); break;
case '?': choice = "default"; break;
default: choice = "unknown"; break;
}
static OPTION_FUNC(opt_maxlogins)
{
- char maxlogins;
+ unsigned char maxlogins;
if (argc > 1) {
maxlogins = strtoul(argv[1], NULL, 0);
if ((maxlogins > nickserv_conf.hard_maxlogins) && !override) {
}
if (hi->opserv_level)
saxdb_write_int(ctx, KEY_OPSERV_LEVEL, hi->opserv_level);
- if (hi->language && (hi->language != lang_C))
+ if (hi->language != lang_C)
saxdb_write_string(ctx, KEY_LANGUAGE, hi->language->name);
saxdb_write_string(ctx, KEY_PASSWD, hi->passwd);
saxdb_write_int(ctx, KEY_REGISTER_ON, hi->registered);
for (cList2=hi_to->channels; cList2; cList2=cList2->u_next)
if (cList->channel == cList2->channel)
break;
- log_module(NS_LOG, LOG_DEBUG, "Merging %s->%s@%s: before %p->%p->%-p, %p->%p->%p",
- hi_from->handle, hi_to->handle, cList->channel->channel->name,
- cList->u_prev, cList, cList->u_next,
- (cList2?cList2->u_prev:0), cList2, (cList2?cList2->u_next:0));
if (cList2 && (cList2->access >= cList->access)) {
+ log_module(NS_LOG, LOG_INFO, "Merge: %s had only %d access in %s (versus %d for %s)", hi_from->handle, cList->access, cList->channel->channel->name, cList2->access, hi_to->handle);
/* keep cList2 in hi_to; remove cList from hi_from */
- log_module(NS_LOG, LOG_DEBUG, "Deleting %p", cList);
del_channel_user(cList, 1);
} else {
if (cList2) {
+ log_module(NS_LOG, LOG_INFO, "Merge: %s had only %d access in %s (versus %d for %s)", hi_to->handle, cList2->access, cList->channel->channel->name, cList->access, hi_from->handle);
/* remove the lower-ranking cList2 from hi_to */
- log_module(NS_LOG, LOG_DEBUG, "Deleting %p", cList2);
del_channel_user(cList2, 1);
+ } else {
+ log_module(NS_LOG, LOG_INFO, "Merge: %s had no access in %s", hi_to->handle, cList->channel->channel->name);
}
/* cList needs to be moved from hi_from to hi_to */
cList->handle = hi_to;
if (hi_to->channels)
hi_to->channels->u_prev = cList;
hi_to->channels = cList;
- log_module(NS_LOG, LOG_DEBUG, "Now %p->%p->%p",
- cList->u_prev, cList, cList->u_next);
}
}
unsigned long flags_on, flags_off;
time_t min_registered, max_registered;
time_t lastseen;
- enum { SUBSET, EXACT, SUPERSET } hostmask_type;
+ enum { SUBSET, EXACT, SUPERSET, LASTQUIT } hostmask_type;
const char *nickmask;
const char *hostmask;
const char *handlemask;
goto fail;
}
if (!irccasecmp(argv[i], "limit")) {
- discrim->limit = atoi(argv[++i]);
+ discrim->limit = strtoul(argv[++i], NULL, 0);
} 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")) {
goto fail;
}
discrim->hostmask_type = SUPERSET;
+ } else if (!irccasecmp(argv[i], "lastquit") || !irccasecmp(argv[i], "lastauth")) {
+ if (i == argc - 1) {
+ send_message(user, nickserv, "MSG_MISSING_PARAMS", argv[i]);
+ goto fail;
+ }
+ discrim->hostmask_type = LASTQUIT;
} else {
i--;
discrim->hostmask_type = SUPERSET;
&& !irccasecmp(discrim->hostmask, mask)) break;
else if ((discrim->hostmask_type == SUPERSET)
&& (match_ircglobs(mask, discrim->hostmask))) break;
+ else if ((discrim->hostmask_type == LASTQUIT)
+ && (match_ircglobs(discrim->hostmask, hi->last_quit_host))) break;
}
if (i==hi->masks->used) return 0;
}
str = database_get_data(obj, KEY_OPSERV_LEVEL, RECDB_QSTRING);
hi->opserv_level = str ? strtoul(str, NULL, 0) : 0;
str = database_get_data(obj, KEY_INFO, RECDB_QSTRING);
- if (str) hi->infoline = strdup(str);
+ if (str)
+ hi->infoline = strdup(str);
str = database_get_data(obj, KEY_REGISTER_ON, RECDB_QSTRING);
hi->registered = str ? (time_t)strtoul(str, NULL, 0) : now;
str = database_get_data(obj, KEY_LAST_SEEN, RECDB_QSTRING);
str = database_get_data(obj, KEY_TABLE_WIDTH, RECDB_QSTRING);
hi->table_width = str ? strtoul(str, NULL, 0) : 0;
str = database_get_data(obj, KEY_LAST_QUIT_HOST, RECDB_QSTRING);
- if (!str) str = database_get_data(obj, KEY_LAST_AUTHED_HOST, RECDB_QSTRING);
- if (str) safestrncpy(hi->last_quit_host, str, sizeof(hi->last_quit_host));
+ if (!str)
+ str = database_get_data(obj, KEY_LAST_AUTHED_HOST, RECDB_QSTRING);
+ if (str)
+ safestrncpy(hi->last_quit_host, str, sizeof(hi->last_quit_host));
str = database_get_data(obj, KEY_EMAIL_ADDR, RECDB_QSTRING);
- if (str) nickserv_set_email_addr(hi, str);
+ if (str)
+ nickserv_set_email_addr(hi, str);
str = database_get_data(obj, KEY_EPITHET, RECDB_QSTRING);
- if (str) hi->epithet = strdup(str);
+ if (str)
+ hi->epithet = strdup(str);
subdb = database_get_data(obj, KEY_COOKIE, RECDB_OBJECT);
if (subdb) {
const char *data, *type, *expires, *cookie_str;
return;
}
str = database_get_data(conf_node, KEY_VALID_HANDLE_REGEX, RECDB_QSTRING);
- if (!str) str = database_get_data(conf_node, KEY_VALID_ACCOUNT_REGEX, RECDB_QSTRING);
+ if (!str)
+ str = database_get_data(conf_node, KEY_VALID_ACCOUNT_REGEX, RECDB_QSTRING);
if (nickserv_conf.valid_handle_regex_set) regfree(&nickserv_conf.valid_handle_regex);
if (str) {
int err = regcomp(&nickserv_conf.valid_handle_regex, str, REG_EXTENDED|REG_ICASE|REG_NOSUB);
nickserv_conf.valid_nick_regex_set = 0;
}
str = database_get_data(conf_node, KEY_NICKS_PER_HANDLE, RECDB_QSTRING);
- if (!str) str = database_get_data(conf_node, KEY_NICKS_PER_ACCOUNT, RECDB_QSTRING);
+ if (!str)
+ str = database_get_data(conf_node, KEY_NICKS_PER_ACCOUNT, RECDB_QSTRING);
nickserv_conf.nicks_per_handle = str ? strtoul(str, NULL, 0) : 4;
str = database_get_data(conf_node, KEY_DISABLE_NICKS, RECDB_QSTRING);
nickserv_conf.disable_nicks = str ? strtoul(str, NULL, 0) : 0;
str = database_get_data(conf_node, KEY_SET_EPITHET_LEVEL, RECDB_QSTRING);
nickserv_conf.set_epithet_level = str ? strtoul(str, NULL, 0) : 1;
str = database_get_data(conf_node, KEY_HANDLE_EXPIRE_FREQ, RECDB_QSTRING);
- if (!str) str = database_get_data(conf_node, KEY_ACCOUNT_EXPIRE_FREQ, RECDB_QSTRING);
+ if (!str)
+ str = database_get_data(conf_node, KEY_ACCOUNT_EXPIRE_FREQ, RECDB_QSTRING);
nickserv_conf.handle_expire_frequency = str ? ParseInterval(str) : 86400;
str = database_get_data(conf_node, KEY_HANDLE_EXPIRE_DELAY, RECDB_QSTRING);
- if (!str) str = database_get_data(conf_node, KEY_ACCOUNT_EXPIRE_DELAY, RECDB_QSTRING);
+ if (!str)
+ str = database_get_data(conf_node, KEY_ACCOUNT_EXPIRE_DELAY, RECDB_QSTRING);
nickserv_conf.handle_expire_delay = str ? ParseInterval(str) : 86400*30;
str = database_get_data(conf_node, KEY_NOCHAN_HANDLE_EXPIRE_DELAY, RECDB_QSTRING);
- if (!str) str = database_get_data(conf_node, KEY_NOCHAN_ACCOUNT_EXPIRE_DELAY, RECDB_QSTRING);
+ if (!str)
+ str = database_get_data(conf_node, KEY_NOCHAN_ACCOUNT_EXPIRE_DELAY, RECDB_QSTRING);
nickserv_conf.nochan_handle_expire_delay = str ? ParseInterval(str) : 86400*15;
str = database_get_data(conf_node, "warn_clone_auth", RECDB_QSTRING);
nickserv_conf.warn_clone_auth = str ? !disabled_string(str) : 1;
if (str)
nickserv_load_dict(str);
str = database_get_data(conf_node, KEY_NICK, RECDB_QSTRING);
- if (str)
+ if (nickserv && str)
NickChange(nickserv, str, 0);
str = database_get_data(conf_node, KEY_AUTOGAG_ENABLED, RECDB_QSTRING);
nickserv_conf.autogag_enabled = str ? strtoul(str, NULL, 0) : 1;
static void
nickserv_reclaim(struct userNode *user, struct nick_info *ni, enum reclaim_action action) {
+ const char *msg;
char newnick[NICKLEN+1];
assert(user);
irc_svsnick(nickserv, user, newnick);
break;
case RECLAIM_KILL:
- irc_kill(nickserv, user, "NSMSG_RECLAIM_KILL");
+ msg = user_find_message(user, "NSMSG_RECLAIM_KILL");
+ irc_kill(nickserv, user, msg);
break;
}
}
init_nickserv(const char *nick)
{
unsigned int i;
- nickserv = AddService(nick, "Nick Services");
NS_LOG = log_register_type("NickServ", "file:nickserv.log");
reg_new_user_func(handle_new_user);
reg_nick_change_func(handle_nick_change);
userList_init(&curr_helpers);
- nickserv_service = service_register(nickserv, 0);
+ if (nick) {
+ nickserv = AddService(nick, "Nick Services", NULL);
+ nickserv_service = service_register(nickserv);
+ }
saxdb_register("NickServ", nickserv_saxdb_read, nickserv_saxdb_write);
reg_exit_func(nickserv_db_cleanup);
if(nickserv_conf.handle_expire_frequency)
projects / srvx.git / blobdiff