summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--openbsd-compat/port-linux.c4
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a71eab347..63216685b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
120100931 12010910
2 - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact
3 return code since it can apparently return -1 under some conditions. From
4 openssh bugs werbittewas de, ok djm@
5
620100831
2 - OpenBSD CVS Sync 7 - OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2010/08/08 19:36:30 8 - jmc@cvs.openbsd.org 2010/08/08 19:36:30
4 [ssh-keysign.8 ssh.1 sshd.8] 9 [ssh-keysign.8 ssh.1 sshd.8]
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index 89b9a7340..86d16dc6e 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -1,4 +1,4 @@
1/* $Id: port-linux.c,v 1.8 2010/03/01 04:52:50 dtucker Exp $ */ 1/* $Id: port-linux.c,v 1.9 2010/09/10 00:30:25 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com> 4 * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
@@ -45,7 +45,7 @@ ssh_selinux_enabled(void)
45 static int enabled = -1; 45 static int enabled = -1;
46 46
47 if (enabled == -1) { 47 if (enabled == -1) {
48 enabled = is_selinux_enabled(); 48 enabled = (is_selinux_enabled() == 1);
49 debug("SELinux support %s", enabled ? "enabled" : "disabled"); 49 debug("SELinux support %s", enabled ? "enabled" : "disabled");
50 } 50 }
51 51