Re-enable configuring cookies from config file

Which was accidentally removed with the 4.11.1 release.
NLnetLabs · Jan 20, 2025 · 9061b2d · 9061b2d
1 parent a2691cb
commit 9061b2d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,3 +1,11 @@
+20 January 2025: Willem
+	- code repository continues with 4.11.2 under development.
+	- Fix re-enable to configure dns-cookies from config file, which was
+	  accidentally removed with the 4.11.1 release.
+
+19 January 2025: Willem
+	- NSD 4.11.1 emergency quick-fix release
+
 17 January 2025: Willem
 	- Fix #424: Stalled updates after corrupt transfer.
 

diff --git a/doc/RELNOTES b/doc/RELNOTES
@@ -2,7 +2,9 @@ NSD RELEASE NOTES
 
 4.11.2
 ================
-
+BUG FIXES:
+        - Fix re-enable to configure dns-cookies from config file, which was
+          accidentally removed with the 4.11.1 release.
 
 4.11.1
 ================

diff --git a/util.c b/util.c
@@ -1189,21 +1189,23 @@ void reconfig_cookies(struct nsd* nsd, struct nsd_options* options)
 	/* Cookie secrets in the configuration file take precedence */
 	if(options->cookie_secret) {
 #ifndef NDEBUG
-		ssize_t len = hex_pton(options->cookie_secret,
+		ssize_t len =
+#endif
+		hex_pton(options->cookie_secret,
 				nsd->cookie_secrets[0].cookie_secret,
 				NSD_COOKIE_SECRET_SIZE);
 		/* Cookie length guaranteed in configparser.y */
 		assert(len == NSD_COOKIE_SECRET_SIZE);
-#endif
 		nsd->cookie_count = 1;
 		if(options->cookie_staging_secret) {
 #ifndef NDEBUG
-			len = hex_pton(options->cookie_staging_secret,
+			len =
+#endif
+			hex_pton(options->cookie_staging_secret,
 					nsd->cookie_secrets[1].cookie_secret,
 					NSD_COOKIE_SECRET_SIZE);
 			/* Cookie length guaranteed in configparser.y */
 			assert(len == NSD_COOKIE_SECRET_SIZE);
-#endif
 			nsd->cookie_count = 2;
 		}
 		/*************************************************************/