diff options
author | Colin Watson <cjwatson@debian.org> | 2011-02-05 11:09:46 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-02-05 11:09:46 +0000 |
commit | 95f10426499726f33812622009ac98180268c632 (patch) | |
tree | a21f909f1c9aa5857e087c7e2bc8a4a13c5e93b7 /openbsd-compat/port-linux.c | |
parent | 8cd65668d5473dfa4912f8a727c0f30ce40db424 (diff) | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) |
* New upstream release (http://www.openssh.org/txt/release-5.8):
- Fix stack information leak in legacy certificate signing
(http://www.openssh.com/txt/legacy-cert.adv).
Diffstat (limited to 'openbsd-compat/port-linux.c')
-rw-r--r-- | openbsd-compat/port-linux.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c index a2498dc15..dc8b1fa55 100644 --- a/openbsd-compat/port-linux.c +++ b/openbsd-compat/port-linux.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: port-linux.c,v 1.11 2011/01/17 07:50:24 dtucker Exp $ */ | 1 | /* $Id: port-linux.c,v 1.11.4.2 2011/02/04 00:43:08 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com> | 4 | * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com> |
@@ -222,17 +222,16 @@ ssh_selinux_change_context(const char *newname) | |||
222 | void | 222 | void |
223 | ssh_selinux_setfscreatecon(const char *path) | 223 | ssh_selinux_setfscreatecon(const char *path) |
224 | { | 224 | { |
225 | security_context_t context; | 225 | security_context_t context; |
226 | 226 | ||
227 | if (!ssh_selinux_enabled()) | 227 | if (!ssh_selinux_enabled()) |
228 | return; | 228 | return; |
229 | 229 | if (path == NULL) { | |
230 | if (path == NULL) { | 230 | setfscreatecon(NULL); |
231 | setfscreatecon(NULL); | 231 | return; |
232 | return; | 232 | } |
233 | } | 233 | if (matchpathcon(path, 0700, &context) == 0) |
234 | if (matchpathcon(path, 0700, &context) == 0) | 234 | setfscreatecon(context); |
235 | setfscreatecon(context); | ||
236 | } | 235 | } |
237 | 236 | ||
238 | #endif /* WITH_SELINUX */ | 237 | #endif /* WITH_SELINUX */ |