9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server: Move required CAPAB check after authentication and add snote and log.

Browse source
This commit is contained in:
Jilles Tjoelker 2013-01-02 20:07:28 +01:00
parent f09c28e18f
commit 22b24f637d
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
modules/core/m_server.c
View file

@ -109,16 +109,6 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
return 0; return 0;
} }
/* check to ensure any "required" caps are set. --nenolod */
/* XXX: show required CAPABs. */
required_mask = capability_index_get_required(serv_capindex);
if (!IsCapable(client_p, required_mask))
{
exit_client(client_p, client_p, client_p, "Missing required CAPABs");
return 0;
}
/* Now we just have to call check_server and everything should be /* Now we just have to call check_server and everything should be
* check for us... -A1kmm. */ * check for us... -A1kmm. */
switch (check_server(name, client_p)) switch (check_server(name, client_p))
@ -203,6 +193,21 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
return 0; return 0;
} }
/* check to ensure any "required" caps are set. --nenolod */
/* XXX: show required CAPABs. */
required_mask = capability_index_get_required(serv_capindex);
if (!IsCapable(client_p, required_mask))
{
sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
"Link %s dropped, required CAPABs are missing", name);
ilog(L_SERVER, "Link %s%s dropped, required CAPABs are missing",
EmptyString(client_p->name) ? name : "",
log_client_name(client_p, SHOW_IP));
exit_client(client_p, client_p, client_p, "Missing required CAPABs");
return 0;
}
if((target_p = find_server(NULL, name))) if((target_p = find_server(NULL, name)))
{ {
/* /*