From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 10 Apr 2024 09:29:10 +0000 (+0200)
Subject: - Fixup compile without cachedb.
X-Git-Tag: release-1.20.0rc1~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3f85e5a11aa0ce48169c0f37c425982c2702d2b;p=thirdparty%2Funbound.git

- Fixup compile without cachedb.
---

diff --git a/services/mesh.c b/services/mesh.c
index 80d4a5aa5..5bbff2995 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -511,7 +511,6 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 		log_err("mesh_new_client: out of memory initializing serve expired");
 		goto servfail_mem;
 	}
-#ifdef USE_CACHEDB
 	if(!timeout && mesh->env->cfg->serve_expired &&
 		!mesh->env->cfg->serve_expired_client_timeout &&
 		(mesh->env->cachedb_enabled &&
@@ -521,7 +520,6 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 			goto servfail_mem;
 		}
 	}
-#endif
 	/* update statistics */
 	if(was_detached) {
 		log_assert(mesh->num_detached_states > 0);
@@ -627,7 +625,6 @@ mesh_new_callback(struct mesh_area* mesh, struct query_info* qinfo,
 			mesh_state_delete(&s->s);
 		return 0;
 	}
-#ifdef USE_CACHEDB
 	if(!timeout && mesh->env->cfg->serve_expired &&
 		!mesh->env->cfg->serve_expired_client_timeout &&
 		(mesh->env->cachedb_enabled &&
@@ -638,7 +635,6 @@ mesh_new_callback(struct mesh_area* mesh, struct query_info* qinfo,
 			return 0;
 		}
 	}
-#endif
 	/* update statistics */
 	if(was_detached) {
 		log_assert(mesh->num_detached_states > 0);
diff --git a/util/module.h b/util/module.h
index 8913f6526..c84f2626f 100644
--- a/util/module.h
+++ b/util/module.h
@@ -537,10 +537,8 @@ struct module_env {
 	/** EDNS client string information */
 	struct edns_strings* edns_strings;
 
-#ifdef USE_CACHEDB
 	/** the cachedb enabled value, copied and stored here. */
 	int cachedb_enabled;
-#endif
 	/* Make every mesh state unique, do not aggregate mesh states. */
 	int unique_mesh;
 };