diff options
| author | Damien Miller <djm@mindrot.org> | 2007-06-28 08:48:02 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2007-06-28 08:48:02 +1000 |
| commit | 0d7b93473c7654dabdf8b8d207169af0278e9728 (patch) | |
| tree | 325fd96e86eebf05bae41a29019ed81e86ec8837 | |
| parent | febf0f5668f997c63210b3dbd50ce5443b0f6aea (diff) | |
- (djm) bz#1325: Fix SELinux in permissive mode where it would
incorrectly fatal() on errors. patch from cjwatson AT debian.org;
ok dtucker
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | openbsd-compat/port-linux.c | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +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 @@ -3104,4 +3109,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.4710 2007/06/25 12:15:12 dtucker Exp $ +$Id: ChangeLog,v 1.4711 2007/06/27 22:48:02 djm Exp $ diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c index 77f3a1c1..2f697e7d 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.4 2007/06/27 22:48:03 djm 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); |