- (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.

diff --git a/ChangeLog b/ChangeLog
index b83290c2ff496482dbe02330f63f74ae2dbad9c9..8b1269324606920ad91618946044552e17011230 100644 (file)
--- 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 ac1e4fefc6238d07dd73c728f0910baef231c871..be763656ea91443aa645e3f4097065775ab64b47 100644 (file)
--- 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);
 }