machine: ignore containers which disable private user namespace in MapToMachine{User...

[thirdparty/systemd.git] / meson.build

diff --git a/meson.build b/meson.build
index 29ee446d564b7abcf52e2370e9d42bc757d4dd77..c62d2afccd8a0407ccf2133f484557a3238d0f21 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -320,6 +320,7 @@ possible_cc_flags = [
         '-Wwrite-strings',
         '-Werror=overflow',
         '-Werror=shift-count-overflow',
+        '-Werror=shift-overflow=2',
         '-Wdate-time',
         '-Wnested-externs',
         '-ffast-math',
@@ -1136,6 +1137,18 @@ conf.set('DEFAULT_DNSSEC_MODE',
          'DNSSEC_' + default_dnssec.underscorify().to_upper())
 substs.set('DEFAULT_DNSSEC_MODE', default_dnssec)
 
+default_private_dns = get_option('default-private-dns')
+if fuzzer_build
+        default_private_dns = 'no'
+endif
+if default_private_dns != 'no' and conf.get('HAVE_GNUTLS') == 0
+        message('default-private-dns cannot be set to strict or opportunistic when gnutls is disabled. Setting default-private-dns to no.')
+        default_private_dns = 'no'
+endif
+conf.set('DEFAULT_PRIVATE_DNS_MODE',
+         'PRIVATE_DNS_' + default_private_dns.underscorify().to_upper())
+substs.set('DEFAULT_PRIVATE_DNS_MODE', default_private_dns)
+
 want_importd = get_option('importd')
 if want_importd != 'false'
         have = (conf.get('HAVE_LIBCURL') == 1 and
@@ -1584,6 +1597,7 @@ if conf.get('ENABLE_RESOLVE') == 1
                                 libbasic_gcrypt,
                                 libsystemd_resolve_core],
                    dependencies : [threads,
+                                   libgnutls,
                                    libgpg_error,
                                    libm,
                                    libidn],
@@ -2856,6 +2870,7 @@ status = [
         'symbolic gateway hostnames:        @0@'.format(', '.join(gateway_hostnames)),
 
         'default DNSSEC mode:               @0@'.format(default_dnssec),
+        'default private DNS mode:          @0@'.format(default_private_dns),
         'default cgroup hierarchy:          @0@'.format(default_hierarchy),
         'default KillUserProcesses setting: @0@'.format(kill_user_processes)]