X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald-native.c;h=9d1f39f0c5e855ab999018d95781db4f07381686;hb=abad76cc4c8586bc088fec65560cf4db2e0903c2;hp=de8d6998cfdc0c7a35d381041d7d308be72ef802;hpb=0b507b17a760b21e33fc52ff377db6aa5086c680;p=elogind.git diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index de8d6998c..9d1f39f0c 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -25,14 +25,16 @@ #include "socket-util.h" #include "path-util.h" -#include "journald.h" +#include "journald-server.h" #include "journald-native.h" #include "journald-kmsg.h" #include "journald-console.h" #include "journald-syslog.h" -#define ENTRY_SIZE_MAX (1024*1024*64) -#define DATA_SIZE_MAX (1024*1024*64) +/* Make sure not to make this smaller than the maximum coredump + * size. See COREDUMP_MAX in coredump.c */ +#define ENTRY_SIZE_MAX (1024*1024*768) +#define DATA_SIZE_MAX (1024*1024*768) static bool valid_user_field(const char *p, size_t l) { const char *a; @@ -396,7 +398,7 @@ int server_open_native_socket(Server*s) { #ifdef HAVE_SELINUX one = 1; - r = setsockopt(s->syslog_fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one)); + r = setsockopt(s->native_fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one)); if (r < 0) log_warning("SO_PASSSEC failed: %m"); #endif