From: Alexander Koch <ipfire@starkstromkonsument.de>
To: development@lists.ipfire.org
Subject: [PATCH 2/2] zabbix_agentd: Bugfix for /etc/sudoers.d/zabbix.user
Date: Wed, 10 Apr 2019 20:33:31 +0200 [thread overview]
Message-ID: <1554921211-25082-2-git-send-email-ipfire@starkstromkonsument.de> (raw)
In-Reply-To: <1554921211-25082-1-git-send-email-ipfire@starkstromkonsument.de>
[-- Attachment #1: Type: text/plain, Size: 2308 bytes --]
Files containing an '~' or '.' are ignored by sudo when placed in the includedir /etc/sudoers.d This makes the file useless. The file is renamed to "zabbix" instead of "zabbix.user" to fix this.
See: https://www.sudo.ws/man/1.8.13/sudoers.man.html#Including_other_files_from_within_sudoers
Signed-off-by: Alexander Koch <ipfire(a)starkstromkonsument.de>
---
config/backup/includes/zabbix_agentd | 2 +-
config/rootfiles/packages/zabbix_agentd | 2 +-
lfs/zabbix_agentd | 2 +-
src/paks/zabbix_agentd/update.sh | 5 +++++
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/config/backup/includes/zabbix_agentd b/config/backup/includes/zabbix_agentd
index b410dbe..cba18d7 100644
--- a/config/backup/includes/zabbix_agentd
+++ b/config/backup/includes/zabbix_agentd
@@ -1,2 +1,2 @@
-/etc/sudoers.d/zabbix.user
+/etc/sudoers.d/zabbix
/etc/zabbix_agentd/*
diff --git a/config/rootfiles/packages/zabbix_agentd b/config/rootfiles/packages/zabbix_agentd
index db85238..eaecf26 100644
--- a/config/rootfiles/packages/zabbix_agentd
+++ b/config/rootfiles/packages/zabbix_agentd
@@ -1,6 +1,6 @@
etc/logrotate.d/zabbix_agentd
etc/rc.d/init.d/zabbix_agentd
-etc/sudoers.d/zabbix.user
+etc/sudoers.d/zabbix
etc/zabbix_agentd
etc/zabbix_agentd/scripts
etc/zabbix_agentd/zabbix_agentd.conf
diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd
index d7f7fc3..5e50235 100644
--- a/lfs/zabbix_agentd
+++ b/lfs/zabbix_agentd
@@ -108,7 +108,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Install sudoers include file
install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/sudoers \
- /etc/sudoers.d/zabbix.user
+ /etc/sudoers.d/zabbix
# Install include file for backup
install -v -m 644 $(DIR_SRC)/config/backup/includes/zabbix_agentd \
diff --git a/src/paks/zabbix_agentd/update.sh b/src/paks/zabbix_agentd/update.sh
index 89c40d0..7fc1c96 100644
--- a/src/paks/zabbix_agentd/update.sh
+++ b/src/paks/zabbix_agentd/update.sh
@@ -24,3 +24,8 @@
. /opt/pakfire/lib/functions.sh
./uninstall.sh
./install.sh
+
+# Ensure /etc/sudoers.d/zabbix.user is renamed to /etc/sudoers.d/zabbix
+if [ -e /etc/sudoers.d/zabbix.user ]; then
+ mv -v /etc/sudoers.d/zabbix.user /etc/sudoers.d/zabbix
+fi
--
2.7.4
next prev parent reply other threads:[~2019-04-10 18:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-10 18:33 [PATCH 1/2] zabbix_agentd: update to 4.2.0 Alexander Koch
2019-04-10 18:33 ` Alexander Koch [this message]
2019-04-12 14:23 ` Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1554921211-25082-2-git-send-email-ipfire@starkstromkonsument.de \
--to=ipfire@starkstromkonsument.de \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox