Commit: e7f7ce93fb5b6c8898af59d341477ee734417d8b - Farhan-openssh (git)

Farhan/openssh

Commit MetaInfo

• Revision: e7f7ce93fb5b6c8898af59d341477ee734417d8b (tree)
• Time: 2016-06-11 07:39:24
• Author: Greg Hartman <ghartman@goog...>
• Commiter: Greg Hartman

Log Message

Move away from GLOBAL_CFLAGS for ssh configuration

Later branches will not support GLOBAL_CFLAGS.
This change turns on account mapping for all Android builds.
It allows SSHDIR to be set in BoardConfig.mk

Bug: 29277511

Change-Id: Ic1411b97468d61a919763db6d42253fdf148df79

Change Summary

• modified: Android.mk
• modified: auth.c

Incremental Difference

--- a/Android.mk
+++ b/Android.mk
@@ -125,8 +125,9 @@ LOCAL_MODULE := libssh
 LOCAL_CFLAGS+=-O3 -Wno-unused-parameter
 
 LOCAL_CFLAGS += -DGCE_PLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
-ifneq ($(filter gce_x86 calypso, $(TARGET_DEVICE)),)
-LOCAL_CFLAGS += -DANDROID_GCE -DSSHDIR=\"/var/run/ssh\"
+
+ifneq (,$(SSHDIR))
+LOCAL_CFLAGS += -DSSHDIR=\"$(SSHDIR)\"
 endif
 
 include $(BUILD_SHARED_LIBRARY)

--- a/auth.c
+++ b/auth.c
@@ -629,7 +629,7 @@ getpwnamallow(const char *user)
 	aix_setauthdb(user);
 #endif
 
-#ifdef ANDROID_GCE
+#if defined(ANDROID)
 	// Android has a fixed set of users. Any incoming user that we can't
 	// identify should be authenticated as the shell user.
 	if (strcmp(user, "root") && strcmp(user, "shell")) {