Move cmode +N to cmode +d, so that extensions/m_roleplay can retain cmode +N and...

[irc/rqf/shadowircd.git] / extensions / m_sendbans.c

diff --git a/extensions/m_sendbans.c b/extensions/m_sendbans.c
index f8829a08e9e0ca891fdd7348850a837932c55b03..a623cf132866b1b31716a4c59e62c594730789a9 100644 (file)
--- a/extensions/m_sendbans.c
+++ b/extensions/m_sendbans.c
@@ -126,8 +126,9 @@ static int mo_sendbans(struct Client *client_p, struct Client *source_p, int par
        }
 
        sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
-                       "%s is sending resvs and xlines to %s",
-                       get_oper_name(source_p), target);
+                       "%s!%s@%s is sending resvs and xlines to %s",
+                       source_p->name, source_p->username, source_p->host,
+                       target);
 
        RB_DLINK_FOREACH(ptr, resv_conf_list.head)
        {
@@ -137,7 +138,7 @@ static int mo_sendbans(struct Client *client_p, struct Client *source_p, int par
                sendto_match_servs(source_p, target,
                                CAP_ENCAP, NOCAPS,
                                "ENCAP %s RESV 0 %s 0 :%s",
-                               target, aconf->name, aconf->passwd);
+                               target, aconf->host, aconf->passwd);
        }
 
        HASH_WALK(i, R_MAX, ptr, resvTable)
@@ -148,7 +149,7 @@ static int mo_sendbans(struct Client *client_p, struct Client *source_p, int par
                sendto_match_servs(source_p, target,
                                CAP_ENCAP, NOCAPS,
                                "ENCAP %s RESV 0 %s 0 :%s",
-                               target, aconf->name, aconf->passwd);
+                               target, aconf->host, aconf->passwd);
        }
        HASH_WALK_END
 
@@ -157,11 +158,11 @@ static int mo_sendbans(struct Client *client_p, struct Client *source_p, int par
                aconf = ptr->data;
                if (aconf->hold)
                        continue;
-               mask2 = expand_xline(aconf->name);
+               mask2 = expand_xline(aconf->host);
                if (mask2 == NULL)
                {
                        sendto_one_notice(source_p, ":Skipping xline [%s]",
-                                       aconf->name);
+                                       aconf->host);
                        continue;
                }
                sendto_match_servs(source_p, target,