struct Client *target_p;
int hop;
unsigned int required_mask;
+ const char *missing;
name = parv[1];
hop = atoi(parv[2]);
return 0;
}
- /* check to ensure any "required" caps are set. --nenolod */
- /* XXX: show required CAPABs. */
- required_mask = capability_index_get_required(serv_capindex);
- if (required_mask && !(client_p->localClient->caps & 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
* check for us... -A1kmm. */
switch (check_server(name, client_p))
return 0;
}
+ /* check to ensure any "required" caps are set. --nenolod */
+ required_mask = capability_index_get_required(serv_capindex);
+ if (!IsCapable(client_p, required_mask))
+ {
+ missing = capability_index_list(serv_capindex, required_mask &
+ ~client_p->localClient->caps);
+ sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
+ "Link %s dropped, required CAPABs [%s] are missing",
+ name, missing);
+ ilog(L_SERVER, "Link %s%s dropped, required CAPABs [%s] are missing",
+ EmptyString(client_p->name) ? name : "",
+ log_client_name(client_p, SHOW_IP), missing);
+ /* Do not use '[' in the below message because it would cause
+ * it to be considered potentially unsafe (might disclose IP
+ * addresses)
+ */
+ sendto_one(client_p, "ERROR :Missing required CAPABs (%s)", missing);
+ exit_client(client_p, client_p, client_p, "Missing required CAPABs");
+
+ return 0;
+ }
+
if((target_p = find_server(NULL, name)))
{
/*
struct remote_conf *hub_p;
hook_data_client hdata;
rb_dlink_node *ptr;
- int hop;
int hlined = 0;
int llined = 0;
char squitreason[160];
- hop = atoi(parv[2]);
-
/* collision on the name? */
if((target_p = find_server(NULL, parv[1])) != NULL)
{