| 1 |
commit: e93b43433306a40fa13304ab365472df313bca67 |
| 2 |
Author: Sven Wegener <swegener <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 5 20:57:47 2021 +0000 |
| 4 |
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 5 21:21:01 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e93b4343 |
| 7 |
|
| 8 |
net-dns/pdns-recursor: Create socket-dir with correct user |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 11 |
Closes: https://bugs.gentoo.org/793854 |
| 12 |
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org> |
| 13 |
|
| 14 |
net-dns/pdns-recursor/files/pdns-recursor-r2 | 14 ++++++++++---- |
| 15 |
1 file changed, 10 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-r2 b/net-dns/pdns-recursor/files/pdns-recursor-r2 |
| 18 |
index 01ce79167bb..0ca3dfc1878 100644 |
| 19 |
--- a/net-dns/pdns-recursor/files/pdns-recursor-r2 |
| 20 |
+++ b/net-dns/pdns-recursor/files/pdns-recursor-r2 |
| 21 |
@@ -1,12 +1,18 @@ |
| 22 |
#!/sbin/openrc-run |
| 23 |
-# Copyright 1999-2020 Gentoo Authors |
| 24 |
+# Copyright 1999-2021 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
+get_config_option() { |
| 28 |
+ awk -v option="${1}" -F = '$1 == option { print $2 }' "${PDNS_CONFIG}" |
| 29 |
+} |
| 30 |
+ |
| 31 |
PDNS_CONFIGDIR="${PDNS_CONFIGDIR:-/etc/powerdns}" |
| 32 |
|
| 33 |
PDNS_CONFIG="${PDNS_CONFIGDIR}/recursor.conf" |
| 34 |
-PDNS_CHROOTDIR="$( awk -F = '$1 == "chroot" { print $2 }' "${PDNS_CONFIG}" )" |
| 35 |
-PDNS_SOCKETDIR="$( awk -F = '$1 == "socket-dir" { print $2 }' "${PDNS_CONFIG}" )" |
| 36 |
+PDNS_CHROOTDIR="$( get_config_option chroot )" |
| 37 |
+PDNS_SOCKETDIR="$( get_config_option socket-dir )" |
| 38 |
+PDNS_SETUID="$( get_config_option setuid )" |
| 39 |
+PDNS_SETGID="$( get_config_option setgid )" |
| 40 |
[ -z "${PDNS_SOCKETDIR}" -a -z "${PDNS_CHROOTDIR}" ] && PDNS_SOCKETDIR="/var/run/pdns-recursor" |
| 41 |
|
| 42 |
name="PowerDNS Recursor" |
| 43 |
@@ -31,7 +37,7 @@ depend() { |
| 44 |
} |
| 45 |
|
| 46 |
start_pre() { |
| 47 |
- checkpath --directory --mode 750 "${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}" |
| 48 |
+ checkpath --directory --owner "${PDNS_SETUID:-root}:${PDNS_SETGID:-root}" --mode 750 "${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}" |
| 49 |
} |
| 50 |
|
| 51 |
ping() { |
Archives