diff options
| -rw-r--r-- | src/journal/journald-audit.c | 7 | ||||
| -rw-r--r-- | src/journal/journald-audit.h | 2 | ||||
| -rw-r--r-- | src/journal/journald-server.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c index 520d1cbb31..ba8a1ae8bd 100644 --- a/src/journal/journald-audit.c +++ b/src/journal/journald-audit.c @@ -325,7 +325,7 @@ static int map_all_fields( } } -static void process_audit_string(Server *s, int type, const char *data, size_t size, const struct timeval *tv) { +static void process_audit_string(Server *s, int type, const char *data, size_t size) { _cleanup_free_ struct iovec *iov = NULL; size_t n_iov_allocated = 0; unsigned n_iov = 0, k; @@ -398,7 +398,7 @@ static void process_audit_string(Server *s, int type, const char *data, size_t s goto finish; } - server_dispatch_message(s, iov, n_iov, n_iov_allocated, NULL, tv, NULL, 0, NULL, LOG_NOTICE, 0); + server_dispatch_message(s, iov, n_iov, n_iov_allocated, NULL, NULL, NULL, 0, NULL, LOG_NOTICE, 0); finish: /* free() all entries that map_all_fields() added. All others @@ -413,7 +413,6 @@ void server_process_audit_message( const void *buffer, size_t buffer_size, const struct ucred *ucred, - const struct timeval *tv, const union sockaddr_union *sa, socklen_t salen) { @@ -453,7 +452,7 @@ void server_process_audit_message( if (nl->nlmsg_type < AUDIT_FIRST_USER_MSG) return; - process_audit_string(s, nl->nlmsg_type, NLMSG_DATA(nl), nl->nlmsg_len - ALIGN(sizeof(struct nlmsghdr)), tv); + process_audit_string(s, nl->nlmsg_type, NLMSG_DATA(nl), nl->nlmsg_len - ALIGN(sizeof(struct nlmsghdr))); } static int enable_audit(int fd, bool b) { diff --git a/src/journal/journald-audit.h b/src/journal/journald-audit.h index 29bff07163..68cdfb3410 100644 --- a/src/journal/journald-audit.h +++ b/src/journal/journald-audit.h @@ -24,6 +24,6 @@ #include "socket-util.h" #include "journald-server.h" -void server_process_audit_message(Server *s, const void *buffer, size_t buffer_size, const struct ucred *ucred, const struct timeval *tv, const union sockaddr_union *sa, socklen_t salen); +void server_process_audit_message(Server *s, const void *buffer, size_t buffer_size, const struct ucred *ucred, const union sockaddr_union *sa, socklen_t salen); int server_open_audit(Server*s); diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 19cd6fe77c..2f782f245d 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -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."); } |