}
if (user->handle_info->staff_level < min_level) {
- if (!quiet)
+ if (!quiet)
send_message(user, bot, "NSMSG_NO_ACCESS");
- return 0;
+ return 0;
}
return 1;
rf_list[rf_list_used++] = func;
}
-static char *
+char *
generate_fakehost(struct handle_info *handle)
{
extern const char *hidden_host_suffix;
return handle->fakehost;
}
-static char *
+char *
generate_fakeident(struct handle_info *handle, struct userNode *user)
{
static char buffer[USERLEN+1];
return handle->fakeident;
}
-static void
+void
apply_fakehost(struct handle_info *handle, struct userNode *user)
{
struct userNode *target;
return 0;
/* Add any masks they should get. */
if (nickserv_conf.default_hostmask) {
- string_list_append(hi->masks, strdup("*@*"));
+ nickserv_addmask(NULL, hi, strdup("*@*"));
} else {
- string_list_append(hi->masks, generate_hostmask(user, GENMASK_OMITNICK|GENMASK_NO_HIDING|GENMASK_ANY_IDENT));
+ nickserv_addmask(NULL, hi, generate_hostmask(user, GENMASK_OMITNICK|GENMASK_NO_HIDING|GENMASK_ANY_IDENT));
if (irc_in_addr_is_valid(user->ip) && !irc_pton(&ip, NULL, user->hostname))
- string_list_append(hi->masks, generate_hostmask(user, GENMASK_OMITNICK|GENMASK_BYIP|GENMASK_NO_HIDING|GENMASK_ANY_IDENT));
+ nickserv_addmask(NULL, hi, generate_hostmask(user, GENMASK_OMITNICK|GENMASK_BYIP|GENMASK_NO_HIDING|GENMASK_ANY_IDENT));
}
/* If they're the first to register, give them level 1000. */
cryptpass(passwd, hi->passwd);
if (!hi->masks->used) {
irc_in_addr_t ip;
- string_list_append(hi->masks, generate_hostmask(user, GENMASK_OMITNICK|GENMASK_NO_HIDING|GENMASK_ANY_IDENT));
+ nickserv_addmask(NULL, hi, generate_hostmask(user, GENMASK_OMITNICK|GENMASK_NO_HIDING|GENMASK_ANY_IDENT));
if (irc_in_addr_is_valid(user->ip) && irc_pton(&ip, NULL, user->hostname))
- string_list_append(hi->masks, generate_hostmask(user, GENMASK_OMITNICK|GENMASK_BYIP|GENMASK_NO_HIDING|GENMASK_ANY_IDENT));
+ nickserv_addmask(NULL, hi, generate_hostmask(user, GENMASK_OMITNICK|GENMASK_BYIP|GENMASK_NO_HIDING|GENMASK_ANY_IDENT));
}
authlog_add(hi, user, NULL);
argv[pw_arg] = "****";
static MODCMD_FUNC(cmd_oauthlog) {
struct handle_info *hi;
- NICKSERV_MIN_PARMS(1);
+ NICKSERV_MIN_PARMS(2);
if (!(hi = get_victim_oper(user, argv[1])))
return 0;
char *new_mask = canonicalize_hostmask(strdup(mask));
for (i=0; i<hi->masks->used; i++) {
if (!irccasecmp(new_mask, hi->masks->list[i])) {
- send_message(user, nickserv, "NSMSG_ADDMASK_ALREADY", new_mask);
+ if(user)
+ send_message(user, nickserv, "NSMSG_ADDMASK_ALREADY", new_mask);
free(new_mask);
return 0;
}
}
string_list_append(hi->masks, new_mask);
- send_message(user, nickserv, "NSMSG_ADDMASK_SUCCESS", new_mask);
+ if(user)
+ send_message(user, nickserv, "NSMSG_ADDMASK_SUCCESS", new_mask);
return 1;
}
int res;
if (!override) {
- send_message(user, nickserv, "MSG_SETTING_PRIVILEGED", argv[0]);
- return 0;
+ send_message(user, nickserv, "MSG_SETTING_PRIVILEGED", argv[0]);
+ return 0;
}
res = (argc > 1) ? oper_try_set_staff_access(user, nickserv, hi, strtoul(argv[1], NULL, 0)) : 0;
//check if this user is a pending LOC user
if(pendingLOCUsers) {
struct pendingLOCUser *pending, *next, *prev = NULL;
+ int remove;
for(pending = pendingLOCUsers; pending; pending = next) {
next = pending->next;
+ remove = 0;
if(user->handle_info == pending->handle_info) {
pending->authlog->user = user;
free((char*) pending->authlog->hostmask);
pending->authlog->hostmask = generate_hostmask(user, GENMASK_USENICK|GENMASK_STRICT_IDENT|GENMASK_NO_HIDING|GENMASK_STRICT_HOST);
- if(prev)
- prev->next = next;
- else
- pendingLOCUsers = next;
- free(pending);
- }
- if(now - pending->time > 10) {
+ remove = 1;
+ } else if(now - pending->time > 10)
+ remove = 1;
+ if(remove) {
if(prev)
prev->next = next;
else