* New upstream release (http://www.openssh.org/txt/release-6.0).

  - Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections
    (closes: #643312, #650512).
  - Add a new privilege separation sandbox implementation for Linux's new
    seccomp sandbox, automatically enabled on platforms that support it.
    (Note: privilege separation sandboxing is still experimental.)

1 files changed, 3 insertions, 2 deletions

diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index ef91e4446..2b8a14a59 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -1,4 +1,4 @@
-/* $Id: port-linux.c,v 1.16 2011/08/29 06:09:57 djm Exp $ */
+/* $Id: port-linux.c,v 1.17 2012/03/08 23:25:18 djm Exp $ */
 
 /*
  * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
@@ -99,6 +99,7 @@ ssh_selinux_getctxbyname(char *pwname, const char *role)
                 case 0:
                         error("%s: Failed to get default SELinux security "
                             "context for %s", __func__, pwname);
+                        sc = NULL;
                         break;
                 default:
                         fatal("%s: Failed to get default SELinux security "
@@ -114,7 +115,7 @@ ssh_selinux_getctxbyname(char *pwname, const char *role)
                 xfree(lvl);
 #endif
 
-        return (sc);
+        return sc;
 }
 
 /* Set the execution context to the default for the specified user */