Segfault-causing typo (wrong var used for a loop, whoops)

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

diff --git a/src/commands.cpp b/src/commands.cpp
index 048a5fae7183ba9b21208abec813f272c73aabf4..f60b85f67eabe660b22a5292106bcc1d6d152deb 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -79,7 +79,6 @@ const long duration_y = duration_w * 52;
 
 extern user_hash clientlist;
 extern chan_hash chanlist;
-extern whowas_hash whowas;
 
 extern std::vector<userrec*> all_opers;
 extern std::vector<userrec*> local_users;
@@ -177,22 +176,12 @@ void do_whois(userrec* user, userrec* dest,unsigned long signon, unsigned long i
 /* XXX - these really belong in helperfuncs perhaps -- w00t */
 bool is_uline(const char* server)
 {
-       char ServName[MAXBUF];
-
        if (!server)
                return false;
-       if (!(*server))
+       if (!*server)
                return true;
 
-       for (int i = 0; i < Config->ConfValueEnum("uline",&Config->config_f); i++)
-       {
-               Config->ConfValue("uline","server",i,ServName,&Config->config_f);
-               if (!strcasecmp(server,ServName))
-               {
-                       return true;
-               }
-       }
-       return false;
+       return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
 }
 
 int operstrcmp(char* data,char* input)