chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hashmap: hashmap_move_one() should return -ENOENT when 'other' is NULL
[elogind.git]
/
src
/
journal
/
journald-native.c
diff --git
a/src/journal/journald-native.c
b/src/journal/journald-native.c
index aded9989797e1626598e708a1e858df05ac4c7f3..a6352022dd8b55422b2707fb2b618f1ab26b7cef 100644
(file)
--- a/
src/journal/journald-native.c
+++ b/
src/journal/journald-native.c
@@
-108,8
+108,7
@@
void server_process_native_message(
/* Entry separator */
if (entry_size + n + 1 > ENTRY_SIZE_MAX) { /* data + separators + trailer */
/* Entry separator */
if (entry_size + n + 1 > ENTRY_SIZE_MAX) { /* data + separators + trailer */
- log_debug("Entry is too big with %u properties and %zu bytes, ignoring.",
- n, entry_size);
+ log_debug("Entry is too big with %u properties and %zu bytes, ignoring.", n, entry_size);
continue;
}
continue;
}
@@
-134,8
+133,7
@@
void server_process_native_message(
/* A property follows */
/* n received properties, +1 for _TRANSPORT */
/* A property follows */
/* n received properties, +1 for _TRANSPORT */
- if (!GREEDY_REALLOC(iovec, m, n + 1 + N_IOVEC_META_FIELDS +
- !!object_pid * N_IOVEC_OBJECT_FIELDS)) {
+ if (!GREEDY_REALLOC(iovec, m, n + 1 + N_IOVEC_META_FIELDS + !!object_pid * N_IOVEC_OBJECT_FIELDS)) {
log_oom();
break;
}
log_oom();
break;
}
@@
-419,7
+417,7
@@
int server_open_native_socket(Server*s) {
}
#ifdef HAVE_SELINUX
}
#ifdef HAVE_SELINUX
- if (
use_selinux
()) {
+ if (
mac_selinux_use
()) {
one = 1;
r = setsockopt(s->native_fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one));
if (r < 0)
one = 1;
r = setsockopt(s->native_fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one));
if (r < 0)