diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2024-01-30 11:25:19 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2024-01-30 18:56:21 +0100 |
| commit | 62670a7752fdcdf1bd4eb81c3afe4080fa945a04 (patch) | |
| tree | 465d92c9f69b850ee7b6d22834405e8890fa82c7 /meson.build | |
| parent | test: explicitly set nsec3-iterations to 0 (diff) | |
| download | systemd-62670a7752fdcdf1bd4eb81c3afe4080fa945a04.tar.xz systemd-62670a7752fdcdf1bd4eb81c3afe4080fa945a04.zip | |
meson: don't install broken tmpfiles config with sshd?confdir == 'no'
20-systemd-ssh-generator.conf expands SSHCONFDIR, which is bogus when we
build with -Dsshconfdir=no. Similarly, avoid expanding SSHDCONFDIR in
20-systemd-userdb.conf when building with -Dsshconfdir=no.
Follow-up 6c7fc5d5f2.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meson.build b/meson.build index 136b1eac21..1001c114a4 100644 --- a/meson.build +++ b/meson.build @@ -1669,6 +1669,9 @@ conf.set10('ENABLE_NSS', enable_nss) conf.set10('ENABLE_TIMEDATECTL', get_option('timedated') or get_option('timesyncd')) +conf.set10('ENABLE_SSH_PROXY_CONFIG', sshconfdir != 'no') +conf.set10('ENABLE_SSH_USERDB_CONFIG', conf.get('ENABLE_USERDB') == 1 and sshdconfdir != 'no') + conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', slow_tests) ##################################################################### |