diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-24 13:04:27 -0700 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2013-04-25 02:13:56 +0200 |
| commit | e7ff4e7fe9f3abd2297e4ef7b95dcb2804e051c3 (patch) | |
| tree | e8680426903c4efb8ffd3b6b087b5e0656fb37e1 /src | |
| parent | 78edb35ab4f4227485cb9ec816b43c37e0d5e62a (diff) | |
journal: remove build warning when SELinux is disabled
A small patch to remove a build warnining when SELinux is disabled.
Diffstat (limited to 'src')
| -rw-r--r-- | src/journal/journald-server.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 4134e9fc67..8eab5ad677 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -508,7 +508,7 @@ static void dispatch_message_real( source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=") + DECIMAL_STR_MAX(usec_t)], boot_id[sizeof("_BOOT_ID=") + 32] = "_BOOT_ID=", machine_id[sizeof("_MACHINE_ID=") + 32] = "_MACHINE_ID="; - char *comm, *exe, *cmdline, *cgroup, *session, *unit, *selinux_context, *hostname; + char *comm, *exe, *cmdline, *cgroup, *session, *unit, *hostname; sd_id128_t id; int r; char *t, *c; @@ -615,7 +615,7 @@ static void dispatch_message_real( #ifdef HAVE_SELINUX if (label) { - selinux_context = alloca(sizeof("_SELINUX_CONTEXT=") + label_len); + char *selinux_context = alloca(sizeof("_SELINUX_CONTEXT=") + label_len); *((char*) mempcpy(stpcpy(selinux_context, "_SELINUX_CONTEXT="), label, label_len)) = 0; IOVEC_SET_STRING(iovec[n++], selinux_context); @@ -623,7 +623,8 @@ static void dispatch_message_real( security_context_t con; if (getpidcon(ucred->pid, &con) >= 0) { - selinux_context = strappenda("_SELINUX_CONTEXT=", con); + char *selinux_context = strappenda("_SELINUX_CONTEXT=", con); + freecon(con); IOVEC_SET_STRING(iovec[n++], selinux_context); } |