Commit: 5bcf61ca7623cb8d60ea28b6e3d34fdf87c00191 - Farhan-openssh (git)

Farhan/openssh

Commit MetaInfo

• Revision: 5bcf61ca7623cb8d60ea28b6e3d34fdf87c00191 (tree)
• Time: 2017-12-08 10:16:01
• Author: Greg Hartman <ghartman@goog...>
• Commiter: Greg Hartman

Log Message

Enable namespace switching on the legacy branches

Test: Local build and nvnc
Change-Id: I674258b02c17a9573293ffbeb9caa3cbb591156e

Change Summary

• modified: sshd.c

Incremental Difference

--- a/sshd.c
+++ b/sshd.c
@@ -123,7 +123,7 @@
 #include "version.h"
 #include "ssherr.h"
 
-#if defined(ANDROID_GCE) && defined(GCE_PLATFORM_SDK_VERSION) && GCE_PLATFORM_SDK_VERSION >= 28
+#if defined(ANDROID_GCE)
 #define GNU_SOURCE
 #include <sched.h>
 #endif
@@ -1040,7 +1040,7 @@ server_listen(void)
 			continue;
 		}
 
-#if defined(ANDROID_GCE) && defined(GCE_PLATFORM_SDK_VERSION) && GCE_PLATFORM_SDK_VERSION >= 28
+#if defined(ANDROID_GCE)
 		/*
 		 * Android GCE specific, bug 67899876
 		 * Open socket in external namespace, making it possible to serve SSH
@@ -1061,7 +1061,7 @@ server_listen(void)
 		listen_sock = socket(ai->ai_family, ai->ai_socktype,
 		    ai->ai_protocol);
 
-#if defined(ANDROID_GCE) && defined(GCE_PLATFORM_SDK_VERSION) && GCE_PLATFORM_SDK_VERSION >= 28
+#if defined(ANDROID_GCE)
 		if (androidfd > 0) {
 			if (setns(androidfd, 0) != 0) {
 				fprintf(stderr, "Could not set netns: %s\n",