Commit e7ff4e7f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Kay Sievers

journal: remove build warning when SELinux is disabled

A small patch to remove a build warnining when SELinux is disabled.
parent 78edb35a
......@@ -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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment