summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2011-08-12 10:12:53 +1000
committerDarren Tucker <dtucker@zip.com.au>2011-08-12 10:12:53 +1000
commit4d47ec9c892883b60b496335425b427a48498bbc (patch)
tree6bee46de2be82d1c150122229d0a088a41bb6cba
parentddccfb4b985ec765c605fb4eb1e6b54ad9321020 (diff)
- (dtucker) [openbsd-compat/port-linux.c] Bug 1924: Improve selinux context
change error by reporting old and new context names Patch from jchadima at redhat.
-rw-r--r--ChangeLog5
-rw-r--r--openbsd-compat/port-linux.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b83290c2..8b126932 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20110812
+ - (dtucker) [openbsd-compat/port-linux.c] Bug 1924: Improve selinux context
+ change error by reporting old and new context names Patch from
+ jchadima at redhat.
+
20110807
- (dtucker) OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2008/06/26 06:59:39
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index ac1e4fef..be763656 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -1,4 +1,4 @@
-/* $Id: port-linux.c,v 1.14 2011/02/06 02:24:35 dtucker Exp $ */
+/* $Id: port-linux.c,v 1.15 2011/08/12 00:12:55 dtucker Exp $ */
/*
* Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
@@ -201,7 +201,8 @@ ssh_selinux_change_context(const char *newname)
debug3("%s: setting context from '%s' to '%s'", __func__, oldctx,
newctx);
if (setcon(newctx) < 0)
- logit("%s: setcon failed with %s", __func__, strerror (errno));
+ logit("%s: setcon %s from %s failed with %s", __func__, newctx,
+ oldctx, strerror (errno));
xfree(oldctx);
xfree(newctx);
}