From 1200d6285b1d64699c6fa2c8241e2ee40f52d2a3 Mon Sep 17 00:00:00 2001
From: w00t
Date: Thu, 23 Oct 2008 21:39:00 +0000
Subject: Revert earlier time() -> SI->Time() diff for now, this causes
 problems with dns.cpp in mysterious ways.. seemingly a bad pointer there
 somehow..?

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10695 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/modules/extra/m_sqllog.cpp      | 9 +++------
 src/modules/extra/m_ssl_gnutls.cpp  | 2 +-
 src/modules/extra/m_ssl_openssl.cpp | 2 +-
 src/modules/extra/m_testclient.cpp  | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/modules/extra')

diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp
index a3f995355..e57e40354 100644
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -28,8 +28,6 @@ std::map<unsigned long,QueryInfo*> active_queries;
 
 class QueryInfo
 {
-private:
-	InspIRCd* ServerInstance;
 public:
 	QueryState qs;
 	unsigned long id;
@@ -43,9 +41,8 @@ public:
 	time_t date;
 	bool insert;
 
-	QueryInfo(InspIRCd* Instance, const std::string &n, const std::string &s, const std::string &h, unsigned long i, int cat)
+	QueryInfo(const std::string &n, const std::string &s, const std::string &h, unsigned long i, int cat)
 	{
-		ServerInstance = Instance;
 		qs = FIND_SOURCE;
 		nick = n;
 		source = s;
@@ -53,7 +50,7 @@ public:
 		id = i;
 		category = cat;
 		sourceid = nickid = hostid = -1;
-		date = ServerInstance->Time();
+		date = time(NULL);
 		insert = false;
 	}
 
@@ -253,7 +250,7 @@ class ModuleSQLLog : public Module
 		SQLrequest req = SQLrequest(this, SQLModule, dbid, SQLquery("SELECT id,actor FROM ircd_log_actors WHERE actor='?'") % source);
 		if(req.Send())
 		{
-			QueryInfo* i = new QueryInfo(ServerInstance, nick, source, host, req.id, category);
+			QueryInfo* i = new QueryInfo(nick, source, host, req.id, category);
 			i->qs = FIND_SOURCE;
 			active_queries[req.id] = i;
 		}
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 1b2a1de96..aaf19f925 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -903,7 +903,7 @@ class ModuleSSLGnuTLS : public Module
 
 		/* Beware here we do not check for errors.
 		 */
-		if ((gnutls_x509_crt_get_expiration_time(cert) < ServerInstance->Time()) || (gnutls_x509_crt_get_activation_time(cert) > ServerInstance->Time()))
+		if ((gnutls_x509_crt_get_expiration_time(cert) < time(0)) || (gnutls_x509_crt_get_activation_time(cert) > time(0)))
 		{
 			certinfo->data.insert(std::make_pair("error","Not activated, or expired certificate"));
 		}
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 796db66d7..389fffb85 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -871,7 +871,7 @@ class ModuleSSLOpenSSL : public Module
 			certinfo->data.insert(std::make_pair("fingerprint",irc::hex(md, n)));
 		}
 
-		if ((ASN1_UTCTIME_cmp_time_t(X509_get_notAfter(cert), ServerInstance->Time()) == -1) || (ASN1_UTCTIME_cmp_time_t(X509_get_notBefore(cert), ServerInstance->Time()) == 0))
+		if ((ASN1_UTCTIME_cmp_time_t(X509_get_notAfter(cert), time(NULL)) == -1) || (ASN1_UTCTIME_cmp_time_t(X509_get_notBefore(cert), time(NULL)) == 0))
 		{
 			certinfo->data.insert(std::make_pair("error","Not activated, or expired certificate"));
 		}
diff --git a/src/modules/extra/m_testclient.cpp b/src/modules/extra/m_testclient.cpp
index d80070939..c5c07efc0 100644
--- a/src/modules/extra/m_testclient.cpp
+++ b/src/modules/extra/m_testclient.cpp
@@ -40,7 +40,7 @@ public:
 		if(target)
 		{
 			SQLrequest foo = SQLrequest(this, target, "foo",
-					SQLquery("UPDATE rawr SET foo = '?' WHERE bar = 42") % ServerInstance->Time());
+					SQLquery("UPDATE rawr SET foo = '?' WHERE bar = 42") % time(NULL));
 
 			if(foo.Send())
 			{
-- 
cgit v1.3.1-10-gc9f91