chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
paranoia: refuse rm_rf("/")
[elogind.git]
/
src
/
journal
/
journald.c
diff --git
a/src/journal/journald.c
b/src/journal/journald.c
index d2e2fcacac25b6480d8dc6bd6cc06037108c6425..0629f79f1c382fa8ebf624a2faeebee78812642d 100644
(file)
--- a/
src/journal/journald.c
+++ b/
src/journal/journald.c
@@
-2058,7
+2058,6
@@
static int system_journal_open(Server *s) {
}
static int server_flush_to_var(Server *s) {
}
static int server_flush_to_var(Server *s) {
- char path[] = "/run/log/journal/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
Object *o = NULL;
int r;
sd_id128_t machine;
Object *o = NULL;
int r;
sd_id128_t machine;
@@
-2135,6
+2134,7
@@
finish:
s->runtime_journal = NULL;
if (r >= 0) {
s->runtime_journal = NULL;
if (r >= 0) {
+ char path[] = "/run/log/journal/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
sd_id128_to_string(machine, path + 17);
rm_rf(path, false, true, false);
}
sd_id128_to_string(machine, path + 17);
rm_rf(path, false, true, false);
}
@@
-2727,7
+2727,6
@@
static int server_init(Server *s) {
s->rate_limit_burst = DEFAULT_RATE_LIMIT_BURST;
s->forward_to_syslog = true;
s->rate_limit_burst = DEFAULT_RATE_LIMIT_BURST;
s->forward_to_syslog = true;
- s->import_proc_kmsg = true;
s->max_level_store = LOG_DEBUG;
s->max_level_syslog = LOG_DEBUG;
s->max_level_store = LOG_DEBUG;
s->max_level_syslog = LOG_DEBUG;