Merge branch 'master' into stream-reuse

daemon/unbound.c

@@ -534,6 +534,8 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode,
 			LOGIN_SETALL & ~LOGIN_SETUSER & ~LOGIN_SETGROUP) != 0)
 			log_warn("unable to setusercontext %s: %s",
 				cfg->username, strerror(errno));
+#else
+		(void)pwd;
 #endif /* HAVE_SETUSERCONTEXT */
 	}
 #endif /* HAVE_GETPWNAM */

doc/Changelog

@@ -1,3 +1,7 @@
+16 July 2020: Wouter
+	- Fix check conf test for referencing installation paths.
+	- Fix unused variable warning for clang analyzer.
+
 16 July 2020: George
 	- Introduce 'include-toplevel:' configuration option.
 

testdata/04-checkconf.tdir/bad.badfwd

@@ -2,6 +2,7 @@ server:
 	# to make sure the check doesn't fail on username or chrootdir.
 	username: ""	
 	chroot: ""
+	directory: ""
 
 forward-zone:
 	name: "example.com"

testdata/04-checkconf.tdir/bad.user

@@ -1,2 +1,4 @@
 server:
 	username: blabla_noexist_user
+	chroot: ""
+	directory: ""

testdata/04-checkconf.tdir/good.include-toplevel

@@ -10,3 +10,7 @@ server: identity: "top 2"
 include-toplevel: include.includetop.withclauses.*
 include-toplevel: include.include.withclauses.*
 include-toplevel: include.include.withclauses.*
+server:
+	chroot: ""
+	directory: ""
+	username: ""