diff options
author | Damien Miller <djm@mindrot.org> | 2012-03-09 10:25:16 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2012-03-09 10:25:16 +1100 |
commit | 7bf7b889b3bd2c4c226b8ee39b1e9abfca3d5f13 (patch) | |
tree | 0cddbf066fd50b23cacb70b00977dcc7c66ba9a9 /openbsd-compat | |
parent | 93a2d41505981a9f4fd5f1cffec713622215910e (diff) |
- (djm) [openbsd-compat/port-linux.c] bz#1960: fix crash on SELinux
systems where sshd is run in te wrong context. Patch from Sven
Vermeulen; ok dtucker@
Diffstat (limited to 'openbsd-compat')
-rw-r--r-- | openbsd-compat/port-linux.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c index ea8dff40f..aba75387c 100644 --- a/openbsd-compat/port-linux.c +++ b/openbsd-compat/port-linux.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: port-linux.c,v 1.16 2011/08/29 06:09:57 djm Exp $ */ | 1 | /* $Id: port-linux.c,v 1.17 2012/03/08 23:25:18 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com> | 4 | * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com> |
@@ -60,7 +60,7 @@ ssh_selinux_enabled(void) | |||
60 | static security_context_t | 60 | static security_context_t |
61 | ssh_selinux_getctxbyname(char *pwname) | 61 | ssh_selinux_getctxbyname(char *pwname) |
62 | { | 62 | { |
63 | security_context_t sc; | 63 | security_context_t sc = NULL; |
64 | char *sename = NULL, *lvl = NULL; | 64 | char *sename = NULL, *lvl = NULL; |
65 | int r; | 65 | int r; |
66 | 66 | ||
@@ -86,6 +86,7 @@ ssh_selinux_getctxbyname(char *pwname) | |||
86 | case 0: | 86 | case 0: |
87 | error("%s: Failed to get default SELinux security " | 87 | error("%s: Failed to get default SELinux security " |
88 | "context for %s", __func__, pwname); | 88 | "context for %s", __func__, pwname); |
89 | sc = NULL; | ||
89 | break; | 90 | break; |
90 | default: | 91 | default: |
91 | fatal("%s: Failed to get default SELinux security " | 92 | fatal("%s: Failed to get default SELinux security " |
@@ -101,7 +102,7 @@ ssh_selinux_getctxbyname(char *pwname) | |||
101 | xfree(lvl); | 102 | xfree(lvl); |
102 | #endif | 103 | #endif |
103 | 104 | ||
104 | return (sc); | 105 | return sc; |
105 | } | 106 | } |
106 | 107 | ||
107 | /* Set the execution context to the default for the specified user */ | 108 | /* Set the execution context to the default for the specified user */ |