From eda8b64bd6430ddda4cfcb1226426e1d8d95d5e7 Mon Sep 17 00:00:00 2001 From: Sam Dodrill Date: Mon, 8 Dec 2014 09:16:47 -0800 Subject: [PATCH] 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. --- src/s_user.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/s_user.c b/src/s_user.c index 5bcca92..b7295cd 100644 --- a/src/s_user.c +++ b/src/s_user.c @@ -609,8 +609,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User * source_p->hopcount + 1, (long) source_p->tsinfo, ubuf, source_p->username, source_p->host, - IsIPSpoof(source_p) ? "0" : sockhost, - source_p->id, + sockhost, source_p->id, IsDynSpoof(source_p) ? source_p->orighost : "*", EmptyString(source_p->user->suser) ? "*" : source_p->user->suser, source_p->info); @@ -621,8 +620,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User * source_p->hopcount + 1, (long) source_p->tsinfo, ubuf, source_p->username, source_p->host, - IsIPSpoof(source_p) ? "0" : sockhost, - source_p->id, source_p->info); + sockhost, source_p->id, source_p->info); if(!EmptyString(source_p->certfp)) sendto_server(client_p, NULL, CAP_TS6, NOCAPS,