chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: move ACL code into internal library
[elogind.git]
/
src
/
journal
/
journald.c
diff --git
a/src/journal/journald.c
b/src/journal/journald.c
index 87390bdec9921538e3f4c2f6943fffab79e25703..442d2eb5ae58c890edd62a66322d8ca80b283197 100644
(file)
--- a/
src/journal/journald.c
+++ b/
src/journal/journald.c
@@
-50,7
+50,7
@@
#ifdef HAVE_ACL
#include <sys/acl.h>
#include <acl/libacl.h>
#ifdef HAVE_ACL
#include <sys/acl.h>
#include <acl/libacl.h>
-#include "acl
-util
.h"
+#include "acl.h"
#endif
#ifdef HAVE_SELINUX
#endif
#ifdef HAVE_SELINUX
@@
-1258,6
+1258,7
@@
static void process_native_message(
p = e + 1;
continue;
} else {
p = e + 1;
continue;
} else {
+ le64_t l_le;
uint64_t l;
char *k;
uint64_t l;
char *k;
@@
-1266,8
+1267,8
@@
static void process_native_message(
break;
}
break;
}
- memcpy(&l, e + 1, sizeof(uint64_t));
- l = le64toh(l);
+ memcpy(&l
_le
, e + 1, sizeof(uint64_t));
+ l = le64toh(l
_le
);
if (remaining < e - p + 1 + sizeof(uint64_t) + l + 1 ||
e[1+sizeof(uint64_t)+l] != '\n') {
if (remaining < e - p + 1 + sizeof(uint64_t) + l + 1 ||
e[1+sizeof(uint64_t)+l] != '\n') {
@@
-2583,7
+2584,7
@@
static int server_parse_config_file(Server *s) {
assert(s);
assert(s);
- fn = "/etc/systemd/
systemd-
journald.conf";
+ fn = "/etc/systemd/journald.conf";
f = fopen(fn, "re");
if (!f) {
if (errno == ENOENT)
f = fopen(fn, "re");
if (!f) {
if (errno == ENOENT)
@@
-2764,6
+2765,7
@@
int main(int argc, char *argv[]) {
}
log_set_target(LOG_TARGET_CONSOLE);
}
log_set_target(LOG_TARGET_CONSOLE);
+ log_set_facility(LOG_SYSLOG);
log_parse_environment();
log_open();
log_parse_environment();
log_open();