summaryrefslogtreecommitdiff
path: root/openbsd-compat/port-linux.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2007-06-28 08:48:02 +1000
committerDamien Miller <djm@mindrot.org>2007-06-28 08:48:02 +1000
commit0d7b93473c7654dabdf8b8d207169af0278e9728 (patch)
tree325fd96e86eebf05bae41a29019ed81e86ec8837 /openbsd-compat/port-linux.c
parentfebf0f5668f997c63210b3dbd50ce5443b0f6aea (diff)
- (djm) bz#1325: Fix SELinux in permissive mode where it would
incorrectly fatal() on errors. patch from cjwatson AT debian.org; ok dtucker
Diffstat (limited to 'openbsd-compat/port-linux.c')
-rw-r--r--openbsd-compat/port-linux.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index 77f3a1c17..2f697e7d9 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -1,4 +1,4 @@
1/* $Id: port-linux.c,v 1.3 2006/09/01 05:38:41 djm Exp $ */ 1/* $Id: port-linux.c,v 1.4 2007/06/27 22:48:03 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com> 4 * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
@@ -79,6 +79,7 @@ ssh_selinux_getctxbyname(char *pwname)
79 case 0: 79 case 0:
80 error("%s: Failed to get default SELinux security " 80 error("%s: Failed to get default SELinux security "
81 "context for %s", __func__, pwname); 81 "context for %s", __func__, pwname);
82 break;
82 default: 83 default:
83 fatal("%s: Failed to get default SELinux security " 84 fatal("%s: Failed to get default SELinux security "
84 "context for %s (in enforcing mode)", 85 "context for %s (in enforcing mode)",
@@ -115,6 +116,7 @@ ssh_selinux_setup_exec_context(char *pwname)
115 case 0: 116 case 0:
116 error("%s: Failed to set SELinux execution " 117 error("%s: Failed to set SELinux execution "
117 "context for %s", __func__, pwname); 118 "context for %s", __func__, pwname);
119 break;
118 default: 120 default:
119 fatal("%s: Failed to set SELinux execution context " 121 fatal("%s: Failed to set SELinux execution context "
120 "for %s (in enforcing mode)", __func__, pwname); 122 "for %s (in enforcing mode)", __func__, pwname);