diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2020-10-25 17:24:03 +0000 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2020-10-25 17:26:30 +0000 |
| commit | 2e746b4d29cb4aa98b680a2797da3db66487a5ce (patch) | |
| tree | 4b6d11b270503639b53ec9f50277377a1b7fdb10 /package | |
| parent | 09804da80a99cbff1ff4332083883f58b99a9442 (diff) | |
| download | upstream-2e746b4d29cb4aa98b680a2797da3db66487a5ce.tar.gz upstream-2e746b4d29cb4aa98b680a2797da3db66487a5ce.tar.bz2 upstream-2e746b4d29cb4aa98b680a2797da3db66487a5ce.zip | |
busybox: make username consistent
ntpd in packages feed had already a user 'ntp' with UID 123 declared.
Rename the username of busybox-ntpd to be 'ntp' instead of 'ntpd' so
it doesn't clash.
Reported-by: Etienne Champetier <champetier.etienne@gmail.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package')
| -rw-r--r-- | package/network/services/dnsmasq/files/dnsmasqsec_hotplug_acl.json | 2 | ||||
| -rw-r--r-- | package/utils/busybox/Makefile | 2 | ||||
| -rwxr-xr-x | package/utils/busybox/files/sysntpd | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/package/network/services/dnsmasq/files/dnsmasqsec_hotplug_acl.json b/package/network/services/dnsmasq/files/dnsmasqsec_hotplug_acl.json index a5eac3943d..861ecbe034 100644 --- a/package/network/services/dnsmasq/files/dnsmasqsec_hotplug_acl.json +++ b/package/network/services/dnsmasq/files/dnsmasqsec_hotplug_acl.json @@ -1,5 +1,5 @@ { - "user": "ntpd", + "user": "ntp", "access": { "service": { "methods": [ "signal" ] diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile index 6d9a0088e5..25db4ff387 100644 --- a/package/utils/busybox/Makefile +++ b/package/utils/busybox/Makefile @@ -50,7 +50,7 @@ define Package/busybox/Default TITLE:=Core utilities for embedded Linux URL:=http://busybox.net/ DEPENDS:=+BUSYBOX_CONFIG_PAM:libpam +BUSYBOX_CONFIG_NTPD:jsonfilter - USERID:=ntpd=123:ntpd=123 + USERID:=ntp=123:ntp=123 endef define Package/busybox diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd index cbc760a48e..db5fc6c034 100755 --- a/package/utils/busybox/files/sysntpd +++ b/package/utils/busybox/files/sysntpd @@ -58,8 +58,8 @@ start_ntpd_instance() { [ -x /sbin/ujail ] && { procd_add_jail ntpd procd_set_param capabilities /etc/capabilities/ntpd.json - procd_set_param user ntpd - procd_set_param group ntpd + procd_set_param user ntp + procd_set_param group ntp procd_set_param no_new_privs 1 } procd_close_instance |