From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 10 Aug 2026 14:42:59 +0000 (+0200)
Subject: Merge branch 'master' into auth-load-thread
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=156c00a7271000016c23d1ec10d87631eb0fa824;p=thirdparty%2Funbound.git

Merge branch 'master' into auth-load-thread
---

156c00a7271000016c23d1ec10d87631eb0fa824
diff --cc daemon/daemon.h
index 9965ed558,e6f099629..dad339940
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@@ -62,7 -62,7 +62,8 @@@ struct doq_table
  struct cookie_secrets;
  struct fast_reload_thread;
  struct fast_reload_printq;
 +struct auth_load_general_info;
+ struct shared_ports;
  
  #include "dnstap/dnstap_config.h"
  #ifdef USE_DNSTAP