package/openssh: Add sysusers.d snippet
PATCH v3 1/1 package/openssh: Add sysusers.d snippet
Whether using the new sysusers.d snippet, or adding an entry to /etc/password, set the service's home directory to /var/empty. See README.privsep included as part of the openssh distribution.
---
Changes v2 -> v3:
- Define OPENSSH_USERS or install snippet, but not both
- Configure home directory to /var/empty
- Rename snippet sshd-sysusers.conf
--- package/openssh/openssh.mk | 16 ++++++++++++---- package/openssh/sshd-sysusers.conf | 1 + 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 package/openssh/sshd-sysusers.conf
package/openssh/openssh.mk +12 -4
@@ -19,10 +19,6 @@ OPENSSH_CONF_OPTS = \ --disable-wtmpx \ --disable-strip -define OPENSSH_USERS - sshd -1 sshd -1 * - - - SSH drop priv user -endef - define OPENSSH_PERMISSIONS /var/empty d 755 root root - - - - - endef
@@ -61,12 +57,24 @@ else OPENSSH_CONF_OPTS += --without-selinux endif +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUSERS),y) +define OPENSSH_INSTALL_SYSTEMD_SYSUSERS + $(INSTALL) -m 0644 -D package/openssh/sshd-sysusers.conf \ + $(TARGET_DIR)/usr/lib/sysusers.d/sshd.conf +endef +else +define OPENSSH_USERS + sshd -1 sshd -1 * /var/empty - - SSH drop priv user +endef +endif + define OPENSSH_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/openssh/sshd.service \ $(TARGET_DIR)/usr/lib/systemd/system/sshd.service mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants ln -fs ../../../../usr/lib/systemd/system/sshd.service \ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/sshd.service + $(OPENSSH_INSTALL_SYSTEMD_SYSUSERS) endef define OPENSSH_INSTALL_INIT_SYSV
package/openssh/sshd-sysusers.conf new file +1 -0
@@ -0,0 +1 @@ +u sshd - "SSH drop priv user" /var/empty
Signature · 1 line
2.17.2
PATCH v3 1/1 package/openssh: Add sysusers.d snippet
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Chris" == Chris Lesiak <[email protected]> writes:
Whether using the new sysusers.d snippet, or adding an entry to
/etc/password, set the service's home directory to/var/empty. See README.privsep included as part of the openssh distribution.
Quoted 6 lines
Signed-off-by Chris Lesiak <[email protected]>---
Changes v2 -> v3:
- DefineOPENSSH_USERSor install snippet, but not both
- Configure home directory to/var/empty
- Rename snippet sshd-sysusers.conf
Committed to 2018.02.x and 2018.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard