Revert "bus-proxyd: make policy checks optional"

[elogind.git] / src / journal / journald-server.c

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index e06242769e7acc2142b40cad4f7b068d336deac9..62ae79a5cee8e3a32c47d6cd9569beb172d8e09a 100644 (file)
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -375,7 +375,7 @@ static void do_vacuum(Server *s, char *ids, JournalFile *f, const char* path,
                 return;
 
         p = strappenda(path, ids);
-        r = journal_directory_vacuum(p, metrics->max_use, s->max_retention_usec, &s->oldest_file_usec);
+        r = journal_directory_vacuum(p, metrics->max_use, s->max_retention_usec, &s->oldest_file_usec, false);
         if (r < 0 && r != -ENOENT)
                 log_error("Failed to vacuum %s: %s", p, strerror(-r));
 }
@@ -1226,7 +1226,7 @@ int process_datagram(sd_event_source *es, int fd, uint32_t revents, void *userda
                         assert(fd == s->audit_fd);
 
                         if (n > 0 && n_fds == 0)
-                                server_process_audit_message(s, s->buffer, n, ucred, tv, &sa, msghdr.msg_namelen);
+                                server_process_audit_message(s, s->buffer, n, ucred, &sa, msghdr.msg_namelen);
                         else if (n_fds > 0)
                                 log_warning("Got file descriptors via audit socket. Ignoring.");
                 }
@@ -1310,10 +1310,10 @@ static int server_parse_proc_cmdline(Server *s) {
         int r;
 
         r = proc_cmdline(&line);
-        if (r < 0)
+        if (r < 0) {
                 log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
-        if (r <= 0)
                 return 0;
+        }
 
         FOREACH_WORD_QUOTED(w, l, line, state) {
                 _cleanup_free_ char *word;
@@ -1690,6 +1690,7 @@ void server_done(Server *s) {
         free(s->buffer);
         free(s->tty_path);
         free(s->cgroup_root);
+        free(s->hostname_field);
 
         if (s->mmap)
                 mmap_cache_unref(s->mmap);