mirror of
https://github.com/systemd/systemd.git
synced 2024-12-22 17:35:35 +03:00
meson,resolved: make default LLMNR= and MulticastDNS= values configurable
For https://fedoraproject.org/wiki/Changes/systemd-resolved.
This commit is contained in:
parent
c90c597ee3
commit
3614df0575
12
meson.build
12
meson.build
@ -1302,6 +1302,16 @@ conf.set('DEFAULT_DNS_OVER_TLS_MODE',
|
|||||||
'DNS_OVER_TLS_' + default_dns_over_tls.underscorify().to_upper())
|
'DNS_OVER_TLS_' + default_dns_over_tls.underscorify().to_upper())
|
||||||
substs.set('DEFAULT_DNS_OVER_TLS_MODE', default_dns_over_tls)
|
substs.set('DEFAULT_DNS_OVER_TLS_MODE', default_dns_over_tls)
|
||||||
|
|
||||||
|
default_mdns = get_option('default-mdns')
|
||||||
|
conf.set('DEFAULT_MDNS_MODE',
|
||||||
|
'RESOLVE_SUPPORT_' + default_mdns.to_upper())
|
||||||
|
substs.set('DEFAULT_MDNS_MODE', default_mdns)
|
||||||
|
|
||||||
|
default_llmnr = get_option('default-llmnr')
|
||||||
|
conf.set('DEFAULT_LLMNR_MODE',
|
||||||
|
'RESOLVE_SUPPORT_' + default_llmnr.to_upper())
|
||||||
|
substs.set('DEFAULT_LLMNR_MODE', default_llmnr)
|
||||||
|
|
||||||
want_repart = get_option('repart')
|
want_repart = get_option('repart')
|
||||||
if want_repart != 'false'
|
if want_repart != 'false'
|
||||||
have = (conf.get('HAVE_OPENSSL') == 1 and
|
have = (conf.get('HAVE_OPENSSL') == 1 and
|
||||||
@ -3354,6 +3364,8 @@ status = [
|
|||||||
|
|
||||||
'default DNSSEC mode: @0@'.format(default_dnssec),
|
'default DNSSEC mode: @0@'.format(default_dnssec),
|
||||||
'default DNS-over-TLS mode: @0@'.format(default_dns_over_tls),
|
'default DNS-over-TLS mode: @0@'.format(default_dns_over_tls),
|
||||||
|
'default mDNS mode: @0@'.format(default_mdns),
|
||||||
|
'default LLMNR mode: @0@'.format(default_llmnr),
|
||||||
'default cgroup hierarchy: @0@'.format(default_hierarchy),
|
'default cgroup hierarchy: @0@'.format(default_hierarchy),
|
||||||
'default net.naming-scheme setting: @0@'.format(default_net_naming_scheme),
|
'default net.naming-scheme setting: @0@'.format(default_net_naming_scheme),
|
||||||
'default KillUserProcesses setting: @0@'.format(kill_user_processes),
|
'default KillUserProcesses setting: @0@'.format(kill_user_processes),
|
||||||
|
@ -230,6 +230,14 @@ option('default-dns-over-tls', type : 'combo',
|
|||||||
description : 'default DNS-over-TLS mode',
|
description : 'default DNS-over-TLS mode',
|
||||||
choices : ['yes', 'opportunistic', 'no'],
|
choices : ['yes', 'opportunistic', 'no'],
|
||||||
value : 'no')
|
value : 'no')
|
||||||
|
option('default-mdns', type : 'combo',
|
||||||
|
choices : ['yes', 'resolve', 'no'],
|
||||||
|
description : 'default MulticastDNS mode',
|
||||||
|
value : 'yes')
|
||||||
|
option('default-llmnr', type : 'combo',
|
||||||
|
choices : ['yes', 'resolve', 'no'],
|
||||||
|
description : 'default LLMNR mode',
|
||||||
|
value : 'yes')
|
||||||
option('dns-over-tls', type : 'combo', choices : ['auto', 'gnutls', 'openssl', 'true', 'false'],
|
option('dns-over-tls', type : 'combo', choices : ['auto', 'gnutls', 'openssl', 'true', 'false'],
|
||||||
description : 'DNS-over-TLS support')
|
description : 'DNS-over-TLS support')
|
||||||
option('dns-servers', type : 'string',
|
option('dns-servers', type : 'string',
|
||||||
|
@ -581,8 +581,8 @@ int manager_new(Manager **ret) {
|
|||||||
.dns_stub_tcp_fd = -1,
|
.dns_stub_tcp_fd = -1,
|
||||||
.hostname_fd = -1,
|
.hostname_fd = -1,
|
||||||
|
|
||||||
.llmnr_support = RESOLVE_SUPPORT_YES,
|
.llmnr_support = DEFAULT_LLMNR_MODE,
|
||||||
.mdns_support = RESOLVE_SUPPORT_YES,
|
.mdns_support = DEFAULT_MDNS_MODE,
|
||||||
.dnssec_mode = DEFAULT_DNSSEC_MODE,
|
.dnssec_mode = DEFAULT_DNSSEC_MODE,
|
||||||
.dns_over_tls_mode = DEFAULT_DNS_OVER_TLS_MODE,
|
.dns_over_tls_mode = DEFAULT_DNS_OVER_TLS_MODE,
|
||||||
.enable_cache = DNS_CACHE_MODE_YES,
|
.enable_cache = DNS_CACHE_MODE_YES,
|
||||||
|
@ -15,10 +15,10 @@
|
|||||||
#DNS=
|
#DNS=
|
||||||
#FallbackDNS=@DNS_SERVERS@
|
#FallbackDNS=@DNS_SERVERS@
|
||||||
#Domains=
|
#Domains=
|
||||||
#LLMNR=yes
|
|
||||||
#MulticastDNS=yes
|
|
||||||
#DNSSEC=@DEFAULT_DNSSEC_MODE@
|
#DNSSEC=@DEFAULT_DNSSEC_MODE@
|
||||||
#DNSOverTLS=@DEFAULT_DNS_OVER_TLS_MODE@
|
#DNSOverTLS=@DEFAULT_DNS_OVER_TLS_MODE@
|
||||||
|
#MulticastDNS=@DEFAULT_MDNS_MODE@
|
||||||
|
#LLMNR=@DEFAULT_LLMNR_MODE@
|
||||||
#Cache=yes
|
#Cache=yes
|
||||||
#DNSStubListener=yes
|
#DNSStubListener=yes
|
||||||
#ReadEtcHosts=yes
|
#ReadEtcHosts=yes
|
||||||
|
Loading…
Reference in New Issue
Block a user