chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journalctl: complain if unprivileged users attempt to access the journal and persista...
[elogind.git]
/
src
/
journal
/
journald.c
diff --git
a/src/journal/journald.c
b/src/journal/journald.c
index 9d3f4260c757dbdd1c3208539751988c3a40906b..a1deceabdf2bef696239a695b2c37538c42e7177 100644
(file)
--- a/
src/journal/journald.c
+++ b/
src/journal/journald.c
@@
-49,11
+49,11
@@
#include "virt.h"
#include "missing.h"
#include "conf-parser.h"
#include "virt.h"
#include "missing.h"
#include "conf-parser.h"
-#include "journal-rate-limit.h"
#include "journal-internal.h"
#include "journal-vacuum.h"
#include "journal-authenticate.h"
#include "journald.h"
#include "journal-internal.h"
#include "journal-vacuum.h"
#include "journal-authenticate.h"
#include "journald.h"
+#include "journald-rate-limit.h"
#include "journald-kmsg.h"
#include "journald-syslog.h"
#include "journald-stream.h"
#include "journald-kmsg.h"
#include "journald-syslog.h"
#include "journald-stream.h"
@@
-360,7
+360,8
@@
static void server_vacuum(Server *s) {
sd_id128_to_string(machine, ids);
if (s->system_journal) {
sd_id128_to_string(machine, ids);
if (s->system_journal) {
- if (asprintf(&p, "/var/log/journal/%s", ids) < 0) {
+ p = strappend("/var/log/journal/", ids);
+ if (!p) {
log_oom();
return;
}
log_oom();
return;
}
@@
-372,7
+373,8
@@
static void server_vacuum(Server *s) {
}
if (s->runtime_journal) {
}
if (s->runtime_journal) {
- if (asprintf(&p, "/run/log/journal/%s", ids) < 0) {
+ p = strappend("/run/log/journal/", ids);
+ if (!p) {
log_oom();
return;
}
log_oom();
return;
}
@@
-1394,7
+1396,7
@@
static int server_init(Server *s) {
return 0;
}
return 0;
}
-static void maybe_append_tags(Server *s) {
+static void
server_
maybe_append_tags(Server *s) {
#ifdef HAVE_GCRYPT
JournalFile *f;
Iterator i;
#ifdef HAVE_GCRYPT
JournalFile *f;
Iterator i;
@@
-1539,7
+1541,7
@@
int main(int argc, char *argv[]) {
break;
}
break;
}
- maybe_append_tags(&server);
+
server_
maybe_append_tags(&server);
}
log_debug("systemd-journald stopped as pid %lu", (unsigned long) getpid());
}
log_debug("systemd-journald stopped as pid %lu", (unsigned long) getpid());