summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-06-28 10:07:43 +1000
committerDarren Tucker <dtucker@zip.com.au>2007-06-28 10:07:43 +1000
commit4f606dd5c3b937988e44d045b5ffa32961f9a931 (patch)
tree8d60ce88125c06617dd3f58409f8f548f4a7561b
parent202c17be30b34a27ba831ed8ad22bffe46a24ae6 (diff)
- (djm) bz#1325: Fix SELinux in permissive mode where it wouldV_4_6
incorrectly fatal() on errors. patch from cjwatson AT debian.org; ok dtucker (backport from current)
-rw-r--r--ChangeLog8
-rw-r--r--openbsd-compat/port-linux.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d305669c..dc4378eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
+20070628
+ - (djm) bz#1325: Fix SELinux in permissive mode where it would
+ incorrectly fatal() on errors. patch from cjwatson AT debian.org;
+ ok dtucker
+
20070625
+ - (dtucker) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2007/06/13 00:21:27
[scp.c]
don't ftruncate() non-regular files; bz#1236 reported by wood AT
@@ -2887,4 +2893,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4635.2.15 2007/06/25 08:59:31 dtucker Exp $
+$Id: ChangeLog,v 1.4635.2.16 2007/06/28 00:07:43 dtucker Exp $
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index 77f3a1c1..115dd8bf 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -1,4 +1,4 @@
-/* $Id: port-linux.c,v 1.3 2006/09/01 05:38:41 djm Exp $ */
+/* $Id: port-linux.c,v 1.3.6.1 2007/06/28 00:07:44 dtucker Exp $ */
/*
* Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
@@ -79,6 +79,7 @@ ssh_selinux_getctxbyname(char *pwname)
case 0:
error("%s: Failed to get default SELinux security "
"context for %s", __func__, pwname);
+ break;
default:
fatal("%s: Failed to get default SELinux security "
"context for %s (in enforcing mode)",
@@ -115,6 +116,7 @@ ssh_selinux_setup_exec_context(char *pwname)
case 0:
error("%s: Failed to set SELinux execution "
"context for %s", __func__, pwname);
+ break;
default:
fatal("%s: Failed to set SELinux execution context "
"for %s (in enforcing mode)", __func__, pwname);