picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journald: avoid NSS in journald

Browse source 
In order to avoid a deadlock between journald looking up the
"systemd-journal" group name, and nscd (or anyother NSS backing daemon)
logging something back to the journal avoid all NSS in journald the same
way as we avoid it from PID 1.

With this change we rely on the kernel file system logic to adjust the
group of created journal files via the SETGID bit on the journal
directory. To ensure that it is always set, even after the user created
it with a simply "mkdir" on the shell we fix it up via tmpfiles on boot.
This commit is contained in:
Lennart Poettering 2013-09-17 16:42:36 -05:00
parent 265ffa1e05
commit 4608af4333
3 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/journal/journald-server.c
View file

@ -180,25 +180,6 @@ static uint64_t available_space(Server *s, bool verbose) {
return s->cached_available_space;
}
static void server_read_file_gid(Server *s) {
const char *g = "systemd-journal";
int r;
assert(s);
if (s->file_gid_valid)
return;
r = get_group_creds(&g, &s->file_gid);
if (r < 0)
log_warning("Failed to resolve '%s' group: %s", g, strerror(-r));
/* if we couldn't read the gid, then it will be 0, but that's
* fine and we shouldn't try to resolve the group again, so
* let's just pretend it worked right-away. */
s->file_gid_valid = true;
}
void server_fix_perms(Server *s, JournalFile *f, uid_t uid) {
int r;
#ifdef HAVE_ACL
@ -209,11 +190,9 @@ void server_fix_perms(Server *s, JournalFile *f, uid_t uid) {
assert(f);
server_read_file_gid(s);
r = fchmod_and_fchown(f->fd, 0640, 0, s->file_gid);
r = fchmod(f->fd, 0640);
if (r < 0)
log_warning("Failed to fix access mode/rights on %s, ignoring: %s", f->path, strerror(-r));
log_warning("Failed to fix access mode on %s, ignoring: %s", f->path, strerror(-r));
#ifdef HAVE_ACL
if (uid <= 0)

3
src/journal/journald-server.h
View file

@ -97,9 +97,6 @@ typedef struct Server {
usec_t max_file_usec;
usec_t oldest_file_usec;
gid_t file_gid;
bool file_gid_valid;
LIST_HEAD(StdoutStream, stdout_streams);
unsigned n_stdout_streams;

3
tmpfiles.d/systemd.conf
View file

@ -23,3 +23,6 @@ d /run/systemd/machines 0755 root root -
d /run/systemd/shutdown 0755 root root -
F /run/nologin 0644 - - - "System is booting up."
m /var/log/journal 2755 root systemd-journal - -
m /var/log/journal/%m 2755 root systemd-journal - -