Commit: f11ba899d5c04b2e0445e0b47cbf26d89ced4f7d - Farhan-openssh (git)

Farhan/openssh

Commit MetaInfo

• Revision: f11ba899d5c04b2e0445e0b47cbf26d89ced4f7d (tree)
• Time: 2018-02-16 07:12:27
• Author: Elliott Hughes <enh@goog...>
• Commiter: Elliott Hughes

Log Message

Remove assumption that _PATH_BSHELL is a compile-time constant.

The alternative would be to build sshd using the (V)NDK, and I initially
went down that route but the because (a) we build sshd for API level 19
and (b) there are a couple of dependencies on non-NDK libraries/headers,
that's a significantly larger and more complicated change.

One day, when we don't have to support anything older than API 23 we
can remove most/all of the Android-specific changes in this project,
at which time we should drop this change and just build with the (V)NDK.

Bug: http://b/67975799
Test: builds
Change-Id: If6be7947e69b24cfa514a17bee6fef3cfbddc236

Change Summary

• modified: session.c

Incremental Difference

--- a/session.c
+++ b/session.c
@@ -1201,7 +1201,14 @@ do_rc_files(Session *s, const char *shell)
 		if (debug_flag)
 			fprintf(stderr, "Running %s %s\n", _PATH_BSHELL,
 			    _PATH_SSH_SYSTEM_RC);
+#ifdef __ANDROID__
+		/* _PATH_BSHELL is not a compile-time constant on Android. */
+		snprintf(cmd, sizeof cmd, "%s %s", _PATH_BSHELL,
+			 _PATH_SSH_SYSTEM_RC);
+		f = popen(cmd, "w");
+#else
 		f = popen(_PATH_BSHELL " " _PATH_SSH_SYSTEM_RC, "w");
+#endif
 		if (f) {
 			if (do_xauth)
 				fprintf(f, "%s %s\n", s->auth_proto,