diff options
author | Colin Watson <cjwatson@debian.org> | 2007-06-27 16:55:16 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2007-06-27 16:55:16 +0000 |
commit | dfd974ae0cd73b174f1f99831a0a145bc4867647 (patch) | |
tree | dd5589f1cbd91e5ce942e0e9b3815ebff4c61ad4 | |
parent | f4fd50842acd45c85c90f1c2a31c5d0f3059744e (diff) |
* Fix broken switch fallthrough when SELinux is running in permissive mode
(closes: #430838).
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | openbsd-compat/port-linux.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index e8c9e4ba9..421434c38 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,6 +1,8 @@ | |||
1 | openssh (1:4.6p1-3) UNRELEASED; urgency=low | 1 | openssh (1:4.6p1-3) UNRELEASED; urgency=low |
2 | 2 | ||
3 | * Only build PIE executables on Linux and NetBSD (closes: #430455). | 3 | * Only build PIE executables on Linux and NetBSD (closes: #430455). |
4 | * Fix broken switch fallthrough when SELinux is running in permissive mode | ||
5 | (closes: #430838). | ||
4 | 6 | ||
5 | -- Colin Watson <cjwatson@debian.org> Tue, 26 Jun 2007 09:56:40 +0100 | 7 | -- Colin Watson <cjwatson@debian.org> Tue, 26 Jun 2007 09:56:40 +0100 |
6 | 8 | ||
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c index 030c733df..7f15d06fb 100644 --- a/openbsd-compat/port-linux.c +++ b/openbsd-compat/port-linux.c | |||
@@ -96,6 +96,7 @@ ssh_selinux_getctxbyname(char *pwname) | |||
96 | case 0: | 96 | case 0: |
97 | error("%s: Failed to get default SELinux security " | 97 | error("%s: Failed to get default SELinux security " |
98 | "context for %s", __func__, pwname); | 98 | "context for %s", __func__, pwname); |
99 | break; | ||
99 | default: | 100 | default: |
100 | fatal("%s: Failed to get default SELinux security " | 101 | fatal("%s: Failed to get default SELinux security " |
101 | "context for %s (in enforcing mode)", | 102 | "context for %s (in enforcing mode)", |
@@ -132,6 +133,7 @@ ssh_selinux_setup_exec_context(char *pwname) | |||
132 | case 0: | 133 | case 0: |
133 | error("%s: Failed to set SELinux execution " | 134 | error("%s: Failed to set SELinux execution " |
134 | "context for %s", __func__, pwname); | 135 | "context for %s", __func__, pwname); |
136 | break; | ||
135 | default: | 137 | default: |
136 | fatal("%s: Failed to set SELinux execution context " | 138 | fatal("%s: Failed to set SELinux execution context " |
137 | "for %s (in enforcing mode)", __func__, pwname); | 139 | "for %s (in enforcing mode)", __func__, pwname); |