Author: Andres Miller <a1kmm@mware.virtualave.net>

[ircu2.10.12-pk.git] / ircd / s_misc.c

diff --git a/ircd/s_misc.c b/ircd/s_misc.c
index 021dae6e195ccbab061b2f2d2b8586a298a46af8..2760cad3c5b40c4e14843d72728f4f992d724903 100644 (file)
--- a/ircd/s_misc.c
+++ b/ircd/s_misc.c
@@ -170,7 +170,7 @@ const char* get_client_name(const struct Client* sptr, int showip)
   if (MyConnect(sptr)) {
     if (showip)
       ircd_snprintf(0, nbuf, sizeof(nbuf), "%s[%s@%s]", cli_name(sptr),
-            (IsIdented(sptr)) ? cli_username(sptr) : "", cli_sock_ip(sptr));
+            cli_user(sptr)->username, cli_sock_ip(sptr));
     else
         return cli_name(sptr);
     return nbuf;
@@ -270,9 +270,6 @@ static void exit_one_client(struct Client* bcptr, const char* comment)
       Count_serverdisconnects(UserStats);
     else
       Count_remoteserverquits(UserStats);
-#ifdef HEAD_IN_SAND_MAP    
-    map_update(bcptr);
-#endif
   }
   else if (IsMe(bcptr))
   {
@@ -479,6 +476,10 @@ int exit_client(struct Client *cptr,    /* Connection being handled by
                           get_client_name(killer, HIDE_IP));
     sendto_opmask_butone(0, SNO_NETWORK, "Net break: %C %C (%s)",
                         cli_serv(victim)->up, victim, comment);
+
+#if defined(HEAD_IN_SAND_MAP) || defined(HEAD_IN_SAND_LINKS)    
+    map_update(victim);
+#endif
   }
 
   /*