diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-05-30 22:25:01 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-05-30 22:25:01 +0200 |
| commit | ba1261bc02693ac8a7712ade14aab8e22989ba88 (patch) | |
| tree | 879e047af8d2e73f96134b44ddfb70135c3f6635 /src/journal/journald.c | |
| parent | 7c0987d8129e4761d24c21bbc2e5d39731a6b7f0 (diff) | |
build-sys: fix built with --disable-logind
Diffstat (limited to 'src/journal/journald.c')
| -rw-r--r-- | src/journal/journald.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/journal/journald.c b/src/journal/journald.c index 5ecb7f72d3..8ce9ce858b 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -31,10 +31,13 @@ #include <sys/statvfs.h> #include <systemd/sd-journal.h> -#include <systemd/sd-login.h> #include <systemd/sd-messages.h> #include <systemd/sd-daemon.h> +#ifdef HAVE_LOGIND +#include <systemd/sd-login.h> +#endif + #include "mkdir.h" #include "hashmap.h" #include "journal-file.h" @@ -479,7 +482,9 @@ static void dispatch_message_real( if (ucred) { uint32_t audit; +#ifdef HAVE_LOGIND uid_t owner; +#endif realuid = ucred->uid; @@ -538,6 +543,7 @@ static void dispatch_message_real( IOVEC_SET_STRING(iovec[n++], cgroup); } +#ifdef HAVE_LOGIND if (sd_pid_get_session(ucred->pid, &t) >= 0) { session = strappend("_SYSTEMD_SESSION=", t); free(t); @@ -546,7 +552,12 @@ static void dispatch_message_real( IOVEC_SET_STRING(iovec[n++], session); } - if (sd_pid_get_unit(ucred->pid, &t) >= 0) { + if (sd_pid_get_owner_uid(ucred->uid, &owner) >= 0) + if (asprintf(&owner_uid, "_SYSTEMD_OWNER_UID=%lu", (unsigned long) owner) >= 0) + IOVEC_SET_STRING(iovec[n++], owner_uid); +#endif + + if (cg_pid_get_unit(ucred->pid, &t) >= 0) { unit = strappend("_SYSTEMD_UNIT=", t); free(t); @@ -554,10 +565,6 @@ static void dispatch_message_real( IOVEC_SET_STRING(iovec[n++], unit); } - if (sd_pid_get_owner_uid(ucred->uid, &owner) >= 0) - if (asprintf(&owner_uid, "_SYSTEMD_OWNER_UID=%lu", (unsigned long) owner) >= 0) - IOVEC_SET_STRING(iovec[n++], owner_uid); - #ifdef HAVE_SELINUX if (label) { selinux_context = malloc(sizeof("_SELINUX_CONTEXT=") + label_len); |