chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: add support for wall forwarding
[elogind.git]
/
src
/
journal
/
journald-native.c
diff --git
a/src/journal/journald-native.c
b/src/journal/journald-native.c
index c50cf64f5ce26641795b3f27cd6db108e6d0e837..0509c1eaeed31e8d62d9ad34673021985ad23aed 100644
(file)
--- a/
src/journal/journald-native.c
+++ b/
src/journal/journald-native.c
@@
-25,11
+25,13
@@
#include "socket-util.h"
#include "path-util.h"
#include "socket-util.h"
#include "path-util.h"
+#include "selinux-util.h"
#include "journald-server.h"
#include "journald-native.h"
#include "journald-kmsg.h"
#include "journald-console.h"
#include "journald-syslog.h"
#include "journald-server.h"
#include "journald-native.h"
#include "journald-kmsg.h"
#include "journald-console.h"
#include "journald-syslog.h"
+#include "journald-wall.h"
/* Make sure not to make this smaller than the maximum coredump
* size. See COREDUMP_MAX in coredump.c */
/* Make sure not to make this smaller than the maximum coredump
* size. See COREDUMP_MAX in coredump.c */
@@
-264,6
+266,9
@@
void server_process_native_message(
if (s->forward_to_console)
server_forward_console(s, priority, identifier, message, ucred);
if (s->forward_to_console)
server_forward_console(s, priority, identifier, message, ucred);
+
+ if (s->forward_to_wall)
+ server_forward_wall(s, priority, identifier, message, ucred);
}
server_dispatch_message(s, iovec, n, m, ucred, tv, label, label_len, NULL, priority, object_pid);
}
server_dispatch_message(s, iovec, n, m, ucred, tv, label, label_len, NULL, priority, object_pid);
@@
-368,7
+373,6
@@
void server_process_native_file(
int server_open_native_socket(Server*s) {
union sockaddr_union sa;
int one, r;
int server_open_native_socket(Server*s) {
union sockaddr_union sa;
int one, r;
- struct epoll_event ev;
assert(s);
assert(s);
@@
-404,10
+408,12
@@
int server_open_native_socket(Server*s) {
}
#ifdef HAVE_SELINUX
}
#ifdef HAVE_SELINUX
- one = 1;
- r = setsockopt(s->native_fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one));
- if (r < 0)
- log_warning("SO_PASSSEC failed: %m");
+ if (use_selinux()) {
+ one = 1;
+ r = setsockopt(s->native_fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one));
+ if (r < 0)
+ log_warning("SO_PASSSEC failed: %m");
+ }
#endif
one = 1;
#endif
one = 1;
@@
-417,12
+423,10
@@
int server_open_native_socket(Server*s) {
return -errno;
}
return -errno;
}
- zero(ev);
- ev.events = EPOLLIN;
- ev.data.fd = s->native_fd;
- if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, s->native_fd, &ev) < 0) {
- log_error("Failed to add native server fd to epoll object: %m");
- return -errno;
+ r = sd_event_add_io(s->event, &s->native_event_source, s->native_fd, EPOLLIN, process_datagram, s);
+ if (r < 0) {
+ log_error("Failed to add native server fd to event loop: %s", strerror(-r));
+ return r;
}
return 0;
}
return 0;