aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-06-21 01:29:49 +0900
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-06-20 22:28:01 +0200
commit56ddbf1009a16e2c2b063f3c3d41e1416b0fc17a (patch)
tree161737747d144bd5796a2552f1faaefa46d04bff /src/resolve/resolved-conf.c
parentMerge pull request #9350 from poettering/bls-fixes (diff)
downloadsystemd-56ddbf1009a16e2c2b063f3c3d41e1416b0fc17a.tar.gz
systemd-56ddbf1009a16e2c2b063f3c3d41e1416b0fc17a.tar.bz2
systemd-56ddbf1009a16e2c2b063f3c3d41e1416b0fc17a.zip
meson: make DNS-over-TLS support optional
This adds dns-over-tls option to meson. If set to 'false', systemd-resolved is not linked with libgnutls.
Diffstat (limited to 'src/resolve/resolved-conf.c')
-rw-r--r--src/resolve/resolved-conf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c
index 8d01056de..79e388f8a 100644
--- a/src/resolve/resolved-conf.c
+++ b/src/resolve/resolved-conf.c
@@ -392,9 +392,9 @@ int manager_parse_config_file(Manager *m) {
}
#endif
-#if ! HAVE_GNUTLS
+#if ! ENABLE_DNS_OVER_TLS
if (m->dns_over_tls_mode != DNS_OVER_TLS_NO) {
- log_warning("DNS-over-TLS option cannot be set to opportunistic when systemd-resolved is built without gnutls support. Turning off DNS-over-TLS support.");
+ log_warning("DNS-over-TLS option cannot be set to opportunistic when systemd-resolved is built without DNS-over-TLS support. Turning off DNS-over-TLS support.");
m->dns_over_tls_mode = DNS_OVER_TLS_NO;
}
#endif