summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Burchell w00t@inspircd.org <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864>2008-10-01 21:16:11 +0000
committerRobin Burchell w00t@inspircd.org <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864>2008-10-01 21:16:11 +0000
commit8aa6436d7380d160d1fc2eb2235d71b57dacea17 (patch)
tree9a09c986cb265c39fa91e1bde027a1fb85a47eff
parentf10db002a84520002e33799e9cce2549b6bcadd3 (diff)
Merge commit 'trunk' into anopeng
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1294 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--src/modules/os_ignore_db.c1
-rw-r--r--version.log6
2 files changed, 6 insertions, 1 deletions
diff --git a/src/modules/os_ignore_db.c b/src/modules/os_ignore_db.c
index ecdd87bf2..af992b12c 100644
--- a/src/modules/os_ignore_db.c
+++ b/src/modules/os_ignore_db.c
@@ -197,6 +197,7 @@ void load_ignore_db(void) {
time_t expiry_time;
IgnoreData *ign;
+ expiry_time = time(NULL);
fill_db_ptr(dbptr, 0, IGNOREDBVERSION, s_OperServ, IgnoreDB);
/* let's remove existing temp files here, because we only load dbs on startup */
diff --git a/version.log b/version.log
index be4fbd74c..a10a8ac4a 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="22"
VERSION_EXTRA="-svn"
-VERSION_BUILD="1460"
+VERSION_BUILD="1461"
# $Log$
#
+# BUILD : 1.7.22 (1461)
+# BUGS :
+# NOTES : Fixed possible compile warning in os_ignore_db.
+#
# BUILD : 1.7.22 (1460)
# BUGS : 948
# NOTES : Corrected some errors in the OS IGNORE help.