diff options
-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 @@ | |||
1 | 20070628 | ||
2 | - (djm) bz#1325: Fix SELinux in permissive mode where it would | ||
3 | incorrectly fatal() on errors. patch from cjwatson AT debian.org; | ||
4 | ok dtucker | ||
5 | |||
1 | 20070625 | 6 | 20070625 |
2 | - (dtucker) OpenBSD CVS Sync | 7 | - (dtucker) OpenBSD CVS Sync |
3 | - djm@cvs.openbsd.org 2007/06/13 00:21:27 | 8 | - djm@cvs.openbsd.org 2007/06/13 00:21:27 |
@@ -3104,4 +3109,4 @@ | |||
3104 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3109 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3105 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3110 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3106 | 3111 | ||
3107 | $Id: ChangeLog,v 1.4710 2007/06/25 12:15:12 dtucker Exp $ | 3112 | $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 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); |