- Fix #266: Fix build with --without-ssl.

NLnetLabs · Feb 16, 2023 · 16adef8 · 16adef8
1 parent 64595da
commit 16adef8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,3 +1,6 @@
+16 February 2022: Wouter
+	- Fix #266: Fix build with --without-ssl.
+
 2 February 2022: Wouter
 	- Merge #265: Fix C99 compatibility issue.
 

diff --git a/doc/RELNOTES b/doc/RELNOTES
@@ -11,6 +11,7 @@ BUG FIXES:
 	- Fix for #262: More error logging for SSL read failures for zone
 	  transfers.
 	- Merge #265: Fix C99 compatibility issue.
+	- Fix #266: Fix build with --without-ssl.
 
 4.6.1
 ================

diff --git a/nsd-control.c b/nsd-control.c
@@ -44,6 +44,19 @@
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
+
+struct region;
+struct domain_table;
+struct zone;
+struct domain;
+int zonec_parse_string(struct region* ATTR_UNUSED(region),
+	struct domain_table* ATTR_UNUSED(domains),
+	struct zone* ATTR_UNUSED(zone), char* ATTR_UNUSED(str),
+	struct domain** ATTR_UNUSED(parsed), int* ATTR_UNUSED(num_rrs))
+{
+	return 0;
+}
+
 #ifdef HAVE_SSL
 #include <sys/types.h>
 #include <unistd.h>
@@ -76,14 +89,6 @@ static void ssl_path_err(const char* s, const char *path) ATTR_NORETURN;
 /** timeout to wait for connection over stream, in msec */
 #define NSD_CONTROL_CONNECT_TIMEOUT 5000
 
-int zonec_parse_string(region_type* ATTR_UNUSED(region),
-	domain_table_type* ATTR_UNUSED(domains), zone_type* ATTR_UNUSED(zone),
-	char* ATTR_UNUSED(str), domain_type** ATTR_UNUSED(parsed),
-	int* ATTR_UNUSED(num_rrs))
-{
-	return 0;
-}
-
 /** Give nsd-control usage, and exit (1). */
 static void
 usage()