summaryrefslogtreecommitdiffstats
path: root/src/userdb
diff options
context:
space:
mode:
authorFrantisek Sumsal <frantisek@sumsal.cz>2024-01-30 11:25:19 +0100
committerLuca Boccassi <luca.boccassi@gmail.com>2024-01-30 18:56:21 +0100
commit62670a7752fdcdf1bd4eb81c3afe4080fa945a04 (patch)
tree465d92c9f69b850ee7b6d22834405e8890fa82c7 /src/userdb
parenttest: explicitly set nsec3-iterations to 0 (diff)
downloadsystemd-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 'src/userdb')
-rw-r--r--src/userdb/meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/userdb/meson.build b/src/userdb/meson.build
index 2ee366dbae..35303533c3 100644
--- a/src/userdb/meson.build
+++ b/src/userdb/meson.build
@@ -24,7 +24,7 @@ executables += [
},
]
-if conf.get('ENABLE_USERDB') == 1 and sshdconfdir != 'no'
+if conf.get('ENABLE_SSH_USERDB_CONFIG') == 1
custom_target(
'20-systemd-userdb.conf',
input : '20-systemd-userdb.conf.in',