4 files changed, 12 insertions, 12 deletions

diff --git a/include/channel.h b/include/channel.h
index 089a33e..6ac0c1a 100644
--- a/include/channel.h
+++ b/include/channel.h
@@ -102,7 +102,7 @@ struct Ban
 {
   dlink_node node;
   char *name;
-  char *username;
+  char *user;
   char *host;
   char *who;
   size_t len;
diff --git a/modules/core/m_sjoin.c b/modules/core/m_sjoin.c
index 9894398..e9e4532 100644
--- a/modules/core/m_sjoin.c
+++ b/modules/core/m_sjoin.c
@@ -819,7 +819,7 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p,
 
     *mbuf++ = c;
     cur_len += plen;
-    pbuf += sprintf(pbuf, "%s!%s@%s ", banptr->name, banptr->username,
+    pbuf += sprintf(pbuf, "%s!%s@%s ", banptr->name, banptr->user,
                     banptr->host);
     ++count;
 
diff --git a/src/channel.c b/src/channel.c
index e588add..51ce706 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -271,7 +271,7 @@ send_mode_list(struct Client *client_p, struct Channel *chptr,
       *mp = '\0';
     }
 
-    pp += sprintf(pp, "%s!%s@%s ", banptr->name, banptr->username,
+    pp += sprintf(pp, "%s!%s@%s ", banptr->name, banptr->user,
                   banptr->host);
     cur_len += tlen;
   }
@@ -333,7 +333,7 @@ remove_ban(struct Ban *bptr, dlink_list *list)
   dlinkDelete(&bptr->node, list);
 
   MyFree(bptr->name);
-  MyFree(bptr->username);
+  MyFree(bptr->user);
   MyFree(bptr->host);
   MyFree(bptr->who);
 
@@ -587,7 +587,7 @@ find_bmask(const struct Client *who, const dlink_list *const list)
   {
     const struct Ban *bp = ptr->data;
 
-    if (!match(bp->name, who->name) && !match(bp->username, who->username))
+    if (!match(bp->name, who->name) && !match(bp->user, who->username))
     {
       switch (bp->type)
       {
diff --git a/src/channel_mode.c b/src/channel_mode.c
index cef38da..d486b8d 100644
--- a/src/channel_mode.c
+++ b/src/channel_mode.c
@@ -215,7 +215,7 @@ add_id(struct Client *client_p, struct Channel *chptr, char *banid, int type)
   {
     ban_p = ban->data;
     if (!irccmp(ban_p->name, name) &&
-        !irccmp(ban_p->username, user) &&
+        !irccmp(ban_p->user, user) &&
         !irccmp(ban_p->host, host))
     {
       return 0;
@@ -225,7 +225,7 @@ add_id(struct Client *client_p, struct Channel *chptr, char *banid, int type)
   ban_p = mp_pool_get(ban_pool);
   memset(ban_p, 0, sizeof(*ban_p));
   ban_p->name = xstrdup(name);
-  ban_p->username = xstrdup(user);
+  ban_p->user = xstrdup(user);
   ban_p->host = xstrdup(host);
   ban_p->when = CurrentTime;
   ban_p->len = len - 2; /* -2 for @ and ! */
@@ -237,7 +237,7 @@ add_id(struct Client *client_p, struct Channel *chptr, char *banid, int type)
                           strlen(client_p->username) +
                           strlen(client_p->host) + 3);
     sprintf(ban_p->who, "%s!%s@%s", client_p->name,
-               client_p->username, client_p->host);
+            client_p->username, client_p->host);
   }
   else if (IsHidden(client_p) || (IsServer(client_p) && ConfigServerHide.hide_servers))
     ban_p->who = xstrdup(me.name);
@@ -311,7 +311,7 @@ del_id(struct Channel *chptr, char *banid, int type)
     banptr = ban->data;
 
     if (!irccmp(name, banptr->name) &&
-        !irccmp(user, banptr->username) &&
+        !irccmp(user, banptr->user) &&
         !irccmp(host, banptr->host))
     {
       remove_ban(banptr, list);
@@ -770,7 +770,7 @@ chm_ban(struct Client *client_p, struct Client *source_p,
       const struct Ban *banptr = ptr->data;
       sendto_one(client_p, form_str(RPL_BANLIST),
                  me.name, client_p->name, chname,
-                 banptr->name, banptr->username, banptr->host,
+                 banptr->name, banptr->user, banptr->host,
 		 banptr->who, banptr->when);
     }
 
@@ -855,7 +855,7 @@ chm_except(struct Client *client_p, struct Client *source_p,
       const struct Ban *banptr = ptr->data;
       sendto_one(client_p, form_str(RPL_EXCEPTLIST),
                  me.name, client_p->name, chname,
-                 banptr->name, banptr->username, banptr->host,
+                 banptr->name, banptr->user, banptr->host,
 		 banptr->who, banptr->when);
     }
 
@@ -930,7 +930,7 @@ chm_invex(struct Client *client_p, struct Client *source_p,
       const struct Ban *banptr = ptr->data;
       sendto_one(client_p, form_str(RPL_INVITELIST), me.name,
                  client_p->name, chname,
-		 banptr->name, banptr->username, banptr->host,
+		 banptr->name, banptr->user, banptr->host,
                  banptr->who, banptr->when);
     }