summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2011-02-06 13:24:35 +1100
committerDarren Tucker <dtucker@zip.com.au>2011-02-06 13:24:35 +1100
commit3b9617ecbd6bdb205e202a3345e84740851b021c (patch)
treeaad73a6241dc73dab785422750fa3e22ef96a6b1
parent0d30b092ce0dee75cc4f5848720cbb2752694f8e (diff)
- (dtucker) [openbsd-compat/port-linux.c] Bug #1851: fix syntax error in
selinux code. Patch from Leonardo Chiquitto.
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/port-linux.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a404558d..5af606b4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120110206
2 - (dtucker) [openbsd-compat/port-linux.c] Bug #1851: fix syntax error in
3 selinux code. Patch from Leonardo Chiquitto
4
120110204 520110204
2 - OpenBSD CVS Sync 6 - OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2011/01/31 21:42:15 7 - djm@cvs.openbsd.org 2011/01/31 21:42:15
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index eb280e616..ac1e4fefc 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.14 2011/02/06 02:24:35 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com> 4 * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
@@ -213,7 +213,7 @@ ssh_selinux_setfscreatecon(const char *path)
213 213
214 if (!ssh_selinux_enabled()) 214 if (!ssh_selinux_enabled())
215 return; 215 return;
216 if (path == NULL) 216 if (path == NULL) {
217 setfscreatecon(NULL); 217 setfscreatecon(NULL);
218 return; 218 return;
219 } 219 }