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 @@
-20100931
+2010910
+ - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact
+   return code since it can apparently return -1 under some conditions.  From
+   openssh bugs werbittewas de, ok djm@
+
+20100831
  - OpenBSD CVS Sync
    - jmc@cvs.openbsd.org 2010/08/08 19:36:30
      [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 @@
-/* $Id: port-linux.c,v 1.8 2010/03/01 04:52:50 dtucker Exp $ */
+/* $Id: port-linux.c,v 1.9 2010/09/10 00:30:25 dtucker Exp $ */
 
 /*
  * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
@@ -45,7 +45,7 @@ ssh_selinux_enabled(void)
         static int enabled = -1;
 
         if (enabled == -1) {
-                enabled = is_selinux_enabled();
+                enabled = (is_selinux_enabled() == 1);
                 debug("SELinux support %s", enabled ? "enabled" : "disabled");
         }