cherry-pick

20110125
 - (djm) [configure.ac Makefile.in ssh.c openbsd-compat/port-linux.c
   openbsd-compat/port-linux.h] Move SELinux-specific code from ssh.c to
   port-linux.c to avoid compilation errors. Add -lselinux to ssh when
   building with SELinux support to avoid linking failure; report from
   amk AT spamfence.net; ok dtucker

2 files changed, 8 insertions, 10 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 @@
-/* $Id: port-linux.c,v 1.13 2011/01/27 23:30:20 djm Exp $ */
+/* $Id: port-linux.c,v 1.11.4.1 2011/02/04 00:42:21 djm Exp $ */
 
 /*
  * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
@@ -209,15 +209,13 @@ ssh_selinux_change_context(const char *newname)
 void
 ssh_selinux_setfscreatecon(const char *path)
 {
-        security_context_t context;
+                security_context_t context;
 
-        if (!ssh_selinux_enabled())
-                return;
-        if (path == NULL)
-                setfscreatecon(NULL);
-                return;
-        }
-        if (matchpathcon(path, 0700, &context) == 0)
+                if (path == NULL) {
+                        setfscreatecon(NULL);
+                        return;
+                }
+                matchpathcon(path, 0700, &context);
                 setfscreatecon(context);
 }
 
diff --git a/openbsd-compat/port-linux.h b/openbsd-compat/port-linux.h
index e3d1004aa..c2f618400 100644
--- a/openbsd-compat/port-linux.h
+++ b/openbsd-compat/port-linux.h
@@ -1,4 +1,4 @@
-/* $Id: port-linux.h,v 1.5 2011/01/25 01:16:18 djm Exp $ */
+/* $Id: port-linux.h,v 1.4.10.1 2011/02/04 00:42:21 djm Exp $ */
 
 /*
  * Copyright (c) 2006 Damien Miller <djm@openbsd.org>