From 78825899cd6b68037fd1b3c6c77afb7d10c4774e Mon Sep 17 00:00:00 2001 From: jess Date: Sat, 9 Oct 2021 22:45:22 +0100 Subject: [PATCH] explicitly show IP in SNO_BANNED snotes --- extensions/sasl_usercloak.c | 4 ++-- ircd/s_conf.c | 4 ++-- ircd/s_user.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extensions/sasl_usercloak.c b/extensions/sasl_usercloak.c index f23208c4..09e212a1 100644 --- a/extensions/sasl_usercloak.c +++ b/extensions/sasl_usercloak.c @@ -129,8 +129,8 @@ check_new_user(void *vdata) } sendto_realops_snomask(SNO_BANNED, L_NETWIDE, - "Rejecting K-Lined user %s [%s@%s]", - get_client_name(source_p, HIDE_IP), aconf->user, aconf->host); + "Rejecting K-Lined user %s [%s] (%s@%s)", get_client_name(source_p, HIDE_IP), + show_ip(NULL, source_p) ? source_p->sockhost : "255.255.255.255", aconf->user, aconf->host); notify_banned_client(source_p, aconf, K_LINED); } diff --git a/ircd/s_conf.c b/ircd/s_conf.c index 572804d3..bc44cb69 100644 --- a/ircd/s_conf.c +++ b/ircd/s_conf.c @@ -368,8 +368,8 @@ verify_access(struct Client *client_p, const char *username) get_user_ban_reason(aconf)); sendto_realops_snomask(SNO_BANNED, L_NETWIDE, - "Rejecting K-Lined user %s [%s@%s]", - get_client_name(client_p, HIDE_IP), aconf->user, aconf->host); + "Rejecting K-Lined user %s [%s] (%s@%s)", get_client_name(client_p, HIDE_IP), + show_ip(NULL, client_p) ? client_p->sockhost : "255.255.255.255", aconf->user, aconf->host); add_reject(client_p, aconf->user, aconf->host, aconf, NULL); return (BANNED_CLIENT); } diff --git a/ircd/s_user.c b/ircd/s_user.c index ec2005ee..d758b537 100644 --- a/ircd/s_user.c +++ b/ircd/s_user.c @@ -597,8 +597,8 @@ register_local_user(struct Client *client_p, struct Client *source_p) { ServerStats.is_ref++; sendto_realops_snomask(SNO_BANNED, L_NETWIDE, - "Rejecting X-Lined user %s [%s]", - get_client_name(client_p, HIDE_IP), xconf->host); + "Rejecting X-Lined user %s [%s] (%s)", get_client_name(source_p, HIDE_IP), + show_ip(NULL, source_p) ? source_p->sockhost : "255.255.255.255", xconf->host); add_reject(source_p, xconf->host, NULL, NULL, NULL); exit_client(client_p, source_p, &me, "Bad user info");