aboutsummaryrefslogtreecommitdiff
path: root/external/unbound/daemon/unbound.c
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2015-12-30 13:21:50 +0200
committerRiccardo Spagni <ric@spagni.net>2015-12-30 13:21:50 +0200
commit91001aa4460a59a42dc14a32c8e90717fd29dbd2 (patch)
tree68da43b847d517870a2f5c92a6ef13167730945c /external/unbound/daemon/unbound.c
parentMerge pull request #577 (diff)
parentfix missing unbound tests (diff)
downloadmonero-91001aa4460a59a42dc14a32c8e90717fd29dbd2.tar.xz
Merge pull request #578
3edbf57 fix missing unbound tests (Riccardo Spagni) 2d43ae8 update unbound, fix unbound openssl issue on OS X (Riccardo Spagni)
Diffstat (limited to 'external/unbound/daemon/unbound.c')
-rw-r--r--external/unbound/daemon/unbound.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/external/unbound/daemon/unbound.c b/external/unbound/daemon/unbound.c
index 8e07c3895..0ceee538c 100644
--- a/external/unbound/daemon/unbound.c
+++ b/external/unbound/daemon/unbound.c
@@ -180,6 +180,8 @@ static void usage()
SSLeay_version(SSLEAY_VERSION)
#elif defined(HAVE_NSS)
NSS_GetVersion()
+#elif defined(HAVE_NETTLE)
+ "nettle"
#endif
);
printf("linked modules:");
@@ -450,6 +452,9 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode,
/* endpwent below, in case we need pwd for setusercontext */
}
#endif
+#ifdef UB_ON_WINDOWS
+ w_config_adjust_directory(cfg);
+#endif
/* init syslog (as root) if needed, before daemonize, otherwise
* a fork error could not be printed since daemonize closed stderr.*/