summaryrefslogtreecommitdiff
path: root/openbsd-compat/port-linux.c
diff options
context:
space:
mode:
Diffstat (limited to 'openbsd-compat/port-linux.c')
-rw-r--r--openbsd-compat/port-linux.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index eb280e616..ee4290b98 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -1,4 +1,4 @@
1/* $Id: port-linux.c,v 1.13 2011/01/27 23:30:20 djm Exp $ */ 1/* $Id: port-linux.c,v 1.11.4.1 2011/02/04 00:42:21 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com> 4 * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
@@ -209,15 +209,13 @@ ssh_selinux_change_context(const char *newname)
209void 209void
210ssh_selinux_setfscreatecon(const char *path) 210ssh_selinux_setfscreatecon(const char *path)
211{ 211{
212 security_context_t context; 212 security_context_t context;
213 213
214 if (!ssh_selinux_enabled()) 214 if (path == NULL) {
215 return; 215 setfscreatecon(NULL);
216 if (path == NULL) 216 return;
217 setfscreatecon(NULL); 217 }
218 return; 218 matchpathcon(path, 0700, &context);
219 }
220 if (matchpathcon(path, 0700, &context) == 0)
221 setfscreatecon(context); 219 setfscreatecon(context);
222} 220}
223 221