switch "KDX-Line active for" snote to L_NETWIDE and include which mask

[solanum.git] / ircd / client.c

diff --git a/ircd/client.c b/ircd/client.c
index a11873991a2f40d98b043b7a71a67429f2e49aac..136c30a472e6c27d7e9c280ee1a670101397cce8 100644 (file)
--- a/ircd/client.c
+++ b/ircd/client.c
@@ -399,7 +399,7 @@ check_pings_list(rb_dlink_list * list)
                        {
                                if(IsServer(client_p))
                                {
-                                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                                       sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
                                                             "No response from %s, closing link",
                                                             client_p->name);
                                        ilog(L_SERVER,
@@ -466,7 +466,7 @@ check_unknowns_list(rb_dlink_list * list)
                {
                        if(IsAnyServer(client_p))
                        {
-                               sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
+                               sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
                                                     "No response from %s, closing link",
                                                     client_p->name);
                                ilog(L_SERVER,
@@ -548,16 +548,16 @@ check_klines(void)
                {
                        if(IsExemptKline(client_p))
                        {
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                               sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
                                                     "KLINE over-ruled for %s, client is kline_exempt [%s@%s]",
                                                     get_client_name(client_p, HIDE_IP),
                                                     aconf->user, aconf->host);
                                continue;
                        }
 
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                            "KLINE active for %s",
-                                            get_client_name(client_p, HIDE_IP));
+                       sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+                                            "KLINE active for %s (%s@%s)",
+                                            get_client_name(client_p, HIDE_IP), aconf->user, aconf->host);
 
                        notify_banned_client(client_p, aconf, K_LINED);
                        continue;
@@ -638,9 +638,9 @@ check_one_kline(struct ConfItem *kline)
                        continue;
                }
 
-               sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                        "KLINE active for %s",
-                                        get_client_name(client_p, HIDE_IP));
+               sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+                                        "KLINE active for %s (%s@%s)",
+                                        get_client_name(client_p, HIDE_IP), kline->user, kline->host);
 
                notify_banned_client(client_p, kline, K_LINED);
        }
@@ -673,9 +673,9 @@ check_dlines(void)
                        if(aconf->status & CONF_EXEMPTDLINE)
                                continue;
 
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                            "DLINE active for %s",
-                                            get_client_name(client_p, HIDE_IP));
+                       sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+                                            "DLINE active for %s (%s)",
+                                            get_client_name(client_p, HIDE_IP), aconf->host);
 
                        notify_banned_client(client_p, aconf, D_LINED);
                        continue;
@@ -722,15 +722,16 @@ check_xlines(void)
                {
                        if(IsExemptKline(client_p))
                        {
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                               sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
                                                     "XLINE over-ruled for %s, client is kline_exempt [%s]",
                                                     get_client_name(client_p, HIDE_IP),
                                                     aconf->host);
                                continue;
                        }
 
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL, "XLINE active for %s",
-                                            get_client_name(client_p, HIDE_IP));
+                       sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+                                               "XLINE active for %s (%s)",
+                                               get_client_name(client_p, HIDE_IP), aconf->host);
 
                        (void) exit_client(client_p, client_p, &me, "Bad user info");
                        continue;
@@ -772,11 +773,11 @@ resv_nick_fnc(const char *mask, const char *reason, int temp_time)
                        nick = client_p->id;
 
                        /* Tell opers. */
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                       sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
                                "RESV forced nick change for %s!%s@%s to %s; nick matched [%s] (%s)",
                                client_p->name, client_p->username, client_p->host, nick, mask, reason);
 
-                       sendto_realops_snomask(SNO_NCHANGE, L_ALL,
+                       sendto_realops_snomask(SNO_NCHANGE, L_NETWIDE,
                                "Nick change: From %s to %s [%s@%s]",
                                client_p->name, nick, client_p->username, client_p->host);
 
@@ -1301,7 +1302,7 @@ exit_aborted_clients(void *unused)
                rb_dlinkDelete(ptr, &abort_list);
 
                if(IsAnyServer(abt->client))
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                       sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
                                             "Closing link to %s: %s",
                                              abt->client->name, abt->notice);
 
@@ -1833,7 +1834,7 @@ show_ip(struct Client *source_p, struct Client *target_p)
                 * to local opers.
                 */
                if(!ConfigFileEntry.hide_spoof_ips &&
-                  (source_p == NULL || (MyConnect(source_p) && HasPrivilege(source_p, "auspex:hostname"))))
+                  (source_p == NULL || HasPrivilege(source_p, "auspex:hostname")))
                        return 1;
                return 0;
        }
@@ -2135,7 +2136,7 @@ error_exit_client(struct Client *client_p, int error)
        {
                if(error == 0)
                {
-                       sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) && !IsServer(client_p) ? L_NETWIDE : L_ALL,
+                       sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
                                             "Server %s closed the connection",
                                             client_p->name);
 
@@ -2144,7 +2145,7 @@ error_exit_client(struct Client *client_p, int error)
                }
                else
                {
-                       sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) && !IsServer(client_p) ? L_NETWIDE : L_ALL,
+                       sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
                                        "Lost connection to %s: %s",
                                        client_p->name, strerror(current_error));
                        ilog(L_SERVER, "Lost connection to %s: %s",