diff options
-rw-r--r-- | src/modules/extra/m_sqllog.cpp | 3 | ||||
-rw-r--r-- | src/modules/m_ident.cpp | 14 | ||||
-rw-r--r-- | src/modules/m_spy.cpp | 5 |
3 files changed, 6 insertions, 16 deletions
diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp index ce4b23cb4..baa138f88 100644 --- a/src/modules/extra/m_sqllog.cpp +++ b/src/modules/extra/m_sqllog.cpp @@ -25,7 +25,6 @@ static Module* SQLModule; static Module* MyMod; static std::string dbid; -extern time_t TIME; enum LogTypes { LT_OPER = 1, LT_KILL, LT_SERVLINK, LT_XLINE, LT_CONNECT, LT_DISCONNECT, LT_FLOOD, LT_LOADMODULE }; @@ -57,7 +56,7 @@ class QueryInfo id = i; category = cat; sourceid = nickid = hostid = -1; - date = TIME; + date = time(NULL); lastquery = ""; } diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index 4ee49d4ec..5e842b070 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -23,10 +23,6 @@ using namespace std; #include "modules.h" #include "inspircd.h" - - -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; - /* $ModDesc: Provides support for RFC 1413 ident lookups */ // Version 1.5.0.0 - Updated to use InspSocket, faster and neater. @@ -53,7 +49,7 @@ class RFC1413 : public InspSocket { // When we timeout, the connection failed within the allowed timeframe, // so we just display a notice, and tidy off the ident_data. - if (u && (fd_ref_table[ufd] == u)) + if (u && (Instance->fd_ref_table[ufd] == u)) { u->Shrink("ident_data"); u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Could not find your ident, using "+std::string(u->ident)+" instead."); @@ -84,7 +80,7 @@ class RFC1413 : public InspSocket *j = '\0'; // truncate at invalid chars if (*section) { - if (u && (fd_ref_table[ufd] == u)) + if (u && (Instance->fd_ref_table[ufd] == u)) { if (this->Instance->IsIdent(section)) { @@ -125,7 +121,7 @@ class RFC1413 : public InspSocket // descriptor that they were when the lookup began. // // Fixes issue reported by webs, 7 Jun 2006 - if (u && (fd_ref_table[ufd] == u)) + if (u && (Instance->fd_ref_table[ufd] == u)) { u->Shrink("ident_data"); } @@ -133,7 +129,7 @@ class RFC1413 : public InspSocket virtual void OnError(InspSocketError e) { - if (u && (fd_ref_table[ufd] == u)) + if (u && (Instance->fd_ref_table[ufd] == u)) { u->Shrink("ident_data"); } @@ -141,7 +137,7 @@ class RFC1413 : public InspSocket virtual bool OnConnected() { - if (u && (fd_ref_table[ufd] == u)) + if (u && (Instance->fd_ref_table[ufd] == u)) { uslen = sizeof(sock_us); themlen = sizeof(sock_them); diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp index 2f790c299..e1913496c 100644 --- a/src/modules/m_spy.cpp +++ b/src/modules/m_spy.cpp @@ -45,11 +45,6 @@ using namespace std; #define nspace __gnu_cxx - - - -extern chan_hash chanlist; - void spy_userlist(userrec *user,chanrec *c) { static char list[MAXBUF]; |