systemd: use adm group to access the journal, not systemd-journal.
This commit is contained in:
parent
023f7afdf9
commit
a2b240bd6b
2 changed files with 28 additions and 1 deletions
27
srcpkgs/systemd/patches/use_adm_group_in_journal.patch
Normal file
27
srcpkgs/systemd/patches/use_adm_group_in_journal.patch
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
I prefer to use the "adm" group for now.
|
||||||
|
|
||||||
|
--- src/journal/journalctl.c.orig 2013-03-08 14:14:13.671806583 +0100
|
||||||
|
+++ src/journal/journalctl.c 2013-03-08 14:14:44.462969574 +0100
|
||||||
|
@@ -881,16 +881,16 @@ static int verify(sd_journal *j) {
|
||||||
|
static int access_check(void) {
|
||||||
|
|
||||||
|
#ifdef HAVE_ACL
|
||||||
|
- if (access("/var/log/journal", F_OK) < 0 && geteuid() != 0 && in_group("systemd-journal") <= 0) {
|
||||||
|
- log_error("Unprivileged users can't see messages unless persistent log storage is enabled. Users in the group 'systemd-journal' can always see messages.");
|
||||||
|
+ if (access("/var/log/journal", F_OK) < 0 && geteuid() != 0 && in_group("adm") <= 0) {
|
||||||
|
+ log_error("Unprivileged users can't see messages unless persistent log storage is enabled. Users in the group 'adm' can always see messages.");
|
||||||
|
return -EACCES;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (!arg_quiet && geteuid() != 0 && in_group("systemd-journal") <= 0)
|
||||||
|
- log_warning("Showing user generated messages only. Users in the group 'systemd-journal' can see all messages. Pass -q to turn this notice off.");
|
||||||
|
+ if (!arg_quiet && geteuid() != 0 && in_group("adm") <= 0)
|
||||||
|
+ log_warning("Showing user generated messages only. Users in the group 'adm' can see all messages. Pass -q to turn this notice off.");
|
||||||
|
#else
|
||||||
|
- if (geteuid() != 0 && in_group("systemd-journal") <= 0) {
|
||||||
|
- log_error("No access to messages. Only users in the group 'systemd-journal' can see messages.");
|
||||||
|
+ if (geteuid() != 0 && in_group("adm") <= 0) {
|
||||||
|
+ log_error("No access to messages. Only users in the group 'adm' can see messages.");
|
||||||
|
return -EACCES;
|
||||||
|
}
|
||||||
|
#endif
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'systemd'
|
# Template file for 'systemd'
|
||||||
pkgname=systemd
|
pkgname=systemd
|
||||||
version=198
|
version=198
|
||||||
revision=2
|
revision=3
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--libexecdir=/usr/lib
|
configure_args="--libexecdir=/usr/lib
|
||||||
--disable-selinux --disable-tcpwrap --with-rootprefix=/usr
|
--disable-selinux --disable-tcpwrap --with-rootprefix=/usr
|
||||||
|
|
Loading…
Reference in a new issue