explicitly show IP in SNO_BANNED snotes

diff --git a/extensions/sasl_usercloak.c b/extensions/sasl_usercloak.c
index f23208c4825b5e88dc4280a9eaa36d3fe711f878..09e212a11b164760c1c8787823d25a589d0e3c4b 100644 (file)
--- 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 572804d312068c4274d79d534bc24ed66c1b977d..bc44cb69a5db20bfdad858b01ca53db830de470a 100644 (file)
--- 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 ec2005eebb4ba84424f303e14860c1b8a722b630..d758b537c2d9f628522f2031704f40bd420df302 100644 (file)
--- 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");