Strlen bashing.

[user/henk/code/inspircd.git] / src / cmd_userhost.cpp

diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp
index 07e2b1255a440a25bd73ab8ddb800d05a5adbc3c..4fe9eb1b4f8b169240f7027ea93927aaac2cdd80 100644 (file)
--- a/src/cmd_userhost.cpp
+++ b/src/cmd_userhost.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -57,30 +57,32 @@ extern std::vector<ircd_module*> factory;
 extern time_t TIME;
 extern user_hash clientlist;
 extern chan_hash chanlist;
-extern whowas_hash whowas;
 extern std::vector<userrec*> all_opers;
 extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
+extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
 void cmd_userhost::Handle (char **parameters, int pcnt, userrec *user)
 {
        char Return[MAXBUF],junk[MAXBUF];
        snprintf(Return,MAXBUF,"302 %s :",user->nick);
+       
        for (int i = 0; i < pcnt; i++)
        {
                userrec *u = Find(parameters[i]);
-               if (u)
+               if(u)
                {
-                       if (strchr(u->modes,'o'))
-                       {
-                               snprintf(junk,MAXBUF,"%s*=+%s@%s ",u->nick,u->ident,u->host);
-                               strlcat(Return,junk,MAXBUF);
-                       }
+                       if(*u->oper)
+                               if(*user->oper)
+                                       snprintf(junk,MAXBUF,"%s*=+%s@%s ",u->nick,u->ident,u->host);
+                               else
+                                       snprintf(junk,MAXBUF,"%s*=+%s@%s ",u->nick,u->ident,u->dhost);
                        else
-                       {
-                               snprintf(junk,MAXBUF,"%s=+%s@%s ",u->nick,u->ident,u->host);
-                               strlcat(Return,junk,MAXBUF);
-                       }
+                               if(*user->oper)
+                                       snprintf(junk,MAXBUF,"%s=+%s@%s ",u->nick,u->ident,u->host);
+                               else
+                                       snprintf(junk,MAXBUF,"%s=+%s@%s ",u->nick,u->ident,u->dhost);
+
+                       strlcat(Return,junk,MAXBUF);
                }
        }
        WriteServ(user->fd,Return);