diff options
| author | Lennart Poettering <lennart@poettering.net> | 2024-03-01 11:25:52 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2024-04-03 18:01:10 +0200 |
| commit | 5360b10f29d72b6424cbaab7cb5d65cf95fcc828 (patch) | |
| tree | e3a5976cc62d67d5f05ab4fd448fa3691430209d /meson.build | |
| parent | Merge pull request #32065 from bluca/dlopen_debug (diff) | |
| download | systemd-5360b10f29d72b6424cbaab7cb5d65cf95fcc828.tar.xz systemd-5360b10f29d72b6424cbaab7cb5d65cf95fcc828.zip | |
ssh-generator: create privsep dir via tmpfiles.d/ if we are told to
To make it easy to have a workable ssh-generator on various distros,
let's optionally generate the ssh privsep dir via tmpfiles.d/ drop-in.
This enables the concept with a path of /run/sshd/ as default. This is
the path Debian/Ubuntu uses, and means that we just work on those
distros. Debian/Ubuntu is the only distro (apparently?) that puts the
privsep dir under /run/, hence always needs the dir to be created
manually. Other distros don't need it that much, because they place the
dir in /usr/ (fedora, best choice!) or /var/ (others, not ideal, because
still mutable).
Also adds a longer explanation about this in NEWS, in the hope that
distro maintaines read that and maybe start cleaning this up.
Alternative to: #31543
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meson.build b/meson.build index 64dde57680..f4b382c602 100644 --- a/meson.build +++ b/meson.build @@ -210,6 +210,10 @@ if sshdconfdir == '' sshdconfdir = sysconfdir / 'ssh/sshd_config.d' endif +sshdprivsepdir = get_option('sshdprivsepdir') +conf.set10('CREATE_SSHDPRIVSEPDIR', sshdprivsepdir != 'no' and not sshdprivsepdir.startswith('/usr/')) +conf.set('SSHDPRIVSEPDIR', sshdprivsepdir, description : 'SSH privilege separation directory') + libcryptsetup_plugins_dir = get_option('libcryptsetup-plugins-dir') if libcryptsetup_plugins_dir == '' libcryptsetup_plugins_dir = libdir / 'cryptsetup' @@ -2723,6 +2727,7 @@ summary({ 'PAM modules directory' : pamlibdir, 'PAM configuration directory' : pamconfdir, 'ssh server configuration directory' : sshdconfdir, + 'ssh server privilege separation directory' : sshdprivsepdir, 'ssh client configuration directory' : sshconfdir, 'libcryptsetup plugins directory' : libcryptsetup_plugins_dir, 'RPM macros directory' : rpmmacrosdir, |