Manually merge feat/show-ip-on-iline-cloak
Conflicts: src/s_user.c Spoofed host IP addresses are now broadcast. This is 2014, we are not EFNet.
This commit is contained in:
parent
8ea110ad78
commit
eda8b64bd6
|
@ -609,8 +609,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
|
||||||
source_p->hopcount + 1,
|
source_p->hopcount + 1,
|
||||||
(long) source_p->tsinfo, ubuf,
|
(long) source_p->tsinfo, ubuf,
|
||||||
source_p->username, source_p->host,
|
source_p->username, source_p->host,
|
||||||
IsIPSpoof(source_p) ? "0" : sockhost,
|
sockhost, source_p->id,
|
||||||
source_p->id,
|
|
||||||
IsDynSpoof(source_p) ? source_p->orighost : "*",
|
IsDynSpoof(source_p) ? source_p->orighost : "*",
|
||||||
EmptyString(source_p->user->suser) ? "*" : source_p->user->suser,
|
EmptyString(source_p->user->suser) ? "*" : source_p->user->suser,
|
||||||
source_p->info);
|
source_p->info);
|
||||||
|
@ -621,8 +620,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
|
||||||
source_p->hopcount + 1,
|
source_p->hopcount + 1,
|
||||||
(long) source_p->tsinfo, ubuf,
|
(long) source_p->tsinfo, ubuf,
|
||||||
source_p->username, source_p->host,
|
source_p->username, source_p->host,
|
||||||
IsIPSpoof(source_p) ? "0" : sockhost,
|
sockhost, source_p->id, source_p->info);
|
||||||
source_p->id, source_p->info);
|
|
||||||
|
|
||||||
if(!EmptyString(source_p->certfp))
|
if(!EmptyString(source_p->certfp))
|
||||||
sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
|
sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
|
||||||
|
|
Loading…
Reference in New Issue