#include "stdinc.h"
-#include "tools.h"
#include "send.h"
#include "channel.h"
#include "client.h"
#include "config.h"
#include "ircd.h"
#include "numeric.h"
-#include "memory.h"
#include "s_conf.h"
#include "s_serv.h"
#include "hash.h"
#include "msg.h"
#include "parse.h"
#include "modules.h"
-#include "sprintf_irc.h"
#include "whowas.h"
#include "monitor.h"
#include "s_stats.h"
#include "snomask.h"
-#include "irc_string.h"
+#include "match.h"
#include "s_user.h"
static int me_svslogin(struct Client *, struct Client *, int, const char **);
{mg_ignore, mg_ignore, {ms_signon, 6}, mg_ignore, mg_ignore, mg_ignore}
};
-mapi_clist_av1 signon_clist[] = {
+mapi_clist_av1 signon_clist[] = {
&svslogin_msgtab, &signon_msgtab, NULL
};
int valid = 0;
if(!(source_p->flags & FLAGS_SERVICE))
+ {
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "Non-service server %s attempting to execute services-only command SVSLOGIN", source_p->name);
return 0;
+ }
if((target_p = find_client(parv[1])) == NULL)
return 0;
if(clean_nick(parv[2]))
{
- strlcpy(nick, parv[2], NICKLEN + 1);
+ rb_strlcpy(nick, parv[2], NICKLEN + 1);
valid |= NICK_VALID;
}
else if(*target_p->name)
- strlcpy(nick, target_p->name, NICKLEN + 1);
+ rb_strlcpy(nick, target_p->name, NICKLEN + 1);
else
strcpy(nick, "*");
if(clean_username(parv[3]))
{
- strlcpy(user, parv[3], USERLEN + 1);
+ rb_strlcpy(user, parv[3], USERLEN + 1);
valid |= USER_VALID;
}
else
- strlcpy(user, target_p->username, USERLEN + 1);
+ rb_strlcpy(user, target_p->username, USERLEN + 1);
if(clean_host(parv[4]))
{
- strlcpy(host, parv[4], HOSTLEN + 1);
+ rb_strlcpy(host, parv[4], HOSTLEN + 1);
valid |= HOST_VALID;
}
else
- strlcpy(host, target_p->host, HOSTLEN + 1);
+ rb_strlcpy(host, target_p->host, HOSTLEN + 1);
if(*parv[5] == '*')
{
if(target_p->user)
- strlcpy(login, target_p->user->suser, NICKLEN + 1);
+ rb_strlcpy(login, target_p->user->suser, NICKLEN + 1);
else
login[0] = '\0';
}
else if(!strcmp(parv[5], "0"))
login[0] = '\0';
else
- strlcpy(login, parv[5], NICKLEN + 1);
+ rb_strlcpy(login, parv[5], NICKLEN + 1);
/* Login (mostly) follows nick rules. */
if(*login && !clean_nick(login))
exist_p->flags |= FLAGS_KILLED;
kill_client_serv_butone(NULL, exist_p, "%s (Nickname regained by services)",
me.name);
+ sendto_realops_snomask(SNO_SKILL, L_ALL,
+ "Nick collision due to SVSLOGIN on %s",
+ nick);
- snprintf(buf, sizeof(buf), "Killed (%s (Nickname regained by services))",
+ rb_snprintf(buf, sizeof(buf), "Killed (%s (Nickname regained by services))",
me.name);
exit_client(NULL, exist_p, &me, buf);
}else if((exist_p = find_client(nick)) && IsUnknown(exist_p) && exist_p != target_p) {
if(valid & HOST_VALID)
strcpy(target_p->preClient->spoofhost, host);
- strlcpy(user_p->suser, login, NICKLEN + 1);
+ rb_strlcpy(user_p->suser, login, NICKLEN + 1);
}
else
{
- send_signon(NULL, target_p, nick, user, host, CurrentTime, login);
- comm_note(target_p->localClient->fd, "Nick: %s", target_p->name);
+ char note[NICKLEN + 10];
+
+ send_signon(NULL, target_p, nick, user, host, rb_current_time(), login);
+
+ rb_snprintf(note, NICKLEN + 10, "Nick: %s", target_p->name);
+ rb_note(target_p->localClient->F, note);
}
return 0;
if(!clean_nick(parv[1]))
{
- ServerStats->is_kill++;
+ ServerStats.is_kill++;
sendto_realops_snomask(SNO_DEBUG, L_ALL,
"Bad Nick from SIGNON: %s From: %s(via %s)",
parv[1], source_p->servptr->name, client_p->name);
if(!clean_username(parv[2]) || !clean_host(parv[3]))
{
- ServerStats->is_kill++;
+ ServerStats.is_kill++;
sendto_realops_snomask(SNO_DEBUG, L_ALL,
"Bad user@host from SIGNON: %s@%s From: %s(via %s)",
parv[2], parv[3], source_p->servptr->name, client_p->name);
else if(*parv[5] != '*')
{
if (clean_nick(parv[5]))
- strlcpy(login, parv[5], NICKLEN + 1);
+ rb_strlcpy(login, parv[5], NICKLEN + 1);
else
return 0;
}
+ else
+ login[0] = '\0';
target_p = find_named_client(parv[1]);
if(target_p != NULL && target_p != source_p)
"Nick change collision from SIGNON from %s to %s(%s <- %s)(both killed)",
source_p->name, target_p->name, target_p->from->name,
client_p->name);
-
- ServerStats->is_kill++;
+
+ ServerStats.is_kill++;
sendto_one_numeric(target_p, ERR_NICKCOLLISION,
form_str(ERR_NICKCOLLISION), target_p->name);
-
+
kill_client_serv_butone(NULL, source_p, "%s (Nick change collision)", me.name);
-
- ServerStats->is_kill++;
-
+
+ ServerStats.is_kill++;
+
kill_client_serv_butone(NULL, target_p, "%s (Nick change collision)", me.name);
-
+
target_p->flags |= FLAGS_KILLED;
exit_client(NULL, target_p, &me, "Nick collision(new)");
source_p->flags |= FLAGS_KILLED;
{
sameuser = !irccmp(target_p->username, source_p->username) &&
!irccmp(target_p->host, source_p->host);
-
+
if((sameuser && newts < target_p->tsinfo) ||
(!sameuser && newts > target_p->tsinfo))
{
"Nick change collision from SIGNON from %s to %s(%s <- %s)(newer killed)",
source_p->name, target_p->name,
target_p->from->name, client_p->name);
-
- ServerStats->is_kill++;
-
+
+ ServerStats.is_kill++;
+
sendto_one_numeric(target_p, ERR_NICKCOLLISION,
form_str(ERR_NICKCOLLISION), target_p->name);
-
+
/* kill the client issuing the nickchange */
kill_client_serv_butone(client_p, source_p,
"%s (Nick change collision)", me.name);
-
+
source_p->flags |= FLAGS_KILLED;
-
+
if(sameuser)
exit_client(client_p, source_p, &me, "Nick collision(old)");
else
"Nick collision from SIGNON on %s(%s <- %s)(newer killed)",
target_p->name, target_p->from->name,
client_p->name);
-
+
sendto_one_numeric(target_p, ERR_NICKCOLLISION,
form_str(ERR_NICKCOLLISION), target_p->name);
-
+
/* kill the client who existed before hand */
- kill_client_serv_butone(client_p, target_p,
+ kill_client_serv_butone(client_p, target_p,
"%s (Nick collision)", me.name);
-
- ServerStats->is_kill++;
-
+
+ ServerStats.is_kill++;
+
target_p->flags |= FLAGS_KILLED;
(void) exit_client(client_p, target_p, &me, "Nick collision");
}
}
-
+
}
}
sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s SIGNON %s %s %s %ld %s",
use_id(target_p), nick, user, host,
(long) target_p->tsinfo, *login ? login : "0");
- sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s SIGNON %s %s %s %ld %s",
- target_p->name, nick, user, host,
- (long) target_p->tsinfo, *login ? login : "0");
strcpy(target_p->user->suser, login);
projects / solanum.git / blobdiff