From 1d6c639310f9f8f267e71f950b4da7d1169b8f50 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@thekelleys.org.uk>
Date: Fri, 14 Dec 2012 11:19:36 +0000
Subject: [PATCH] Fix broken cache.

---
 CHANGELOG   | 2 ++
 src/cache.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9ffc82e..711a1bf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,8 @@ version 2.65
 
 	    Fix failure to build with DHCP support excluded. Thanks to 
 	    Gustavo Zacarias for the patch.
+	    
+	    Fix nasty regression in 2.64 which completely broke cacheing.
 
 
 version 2.64
diff --git a/src/cache.c b/src/cache.c
index b058582..f9ba335 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -394,7 +394,7 @@ struct crec *cache_insert(char *name, struct all_addr *addr,
   int freed_all = flags & F_REVERSE;
   int free_avail = 0;
 
-  if(daemon->max_cache_ttl < ttl)
+  if (daemon->max_cache_ttl != 0 && daemon->max_cache_ttl < ttl)
     ttl = daemon->max_cache_ttl;
 
   /* Don't log keys */