Fix broken cache.

This commit is contained in:
Simon Kelley
2012-12-14 11:19:36 +00:00
parent 429798fd08
commit 1d6c639310
2 changed files with 3 additions and 1 deletions

View File

@@ -6,6 +6,8 @@ version 2.65
Fix failure to build with DHCP support excluded. Thanks to Fix failure to build with DHCP support excluded. Thanks to
Gustavo Zacarias for the patch. Gustavo Zacarias for the patch.
Fix nasty regression in 2.64 which completely broke cacheing.
version 2.64 version 2.64
Handle DHCP FQDN options with all flag bits zero and Handle DHCP FQDN options with all flag bits zero and

View File

@@ -394,7 +394,7 @@ struct crec *cache_insert(char *name, struct all_addr *addr,
int freed_all = flags & F_REVERSE; int freed_all = flags & F_REVERSE;
int free_avail = 0; 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; ttl = daemon->max_cache_ttl;
/* Don't log keys */ /* Don't log keys */