Commit | Line | Data |
---|---|---|
dd9da8b3 FF |
1 | diff -u -r ../openssh-7.2p2/session.c ./session.c |
2 | --- ../openssh-7.2p2/session.c 2016-03-09 13:04:48.000000000 -0500 | |
3 | +++ ./session.c 2016-06-26 17:17:15.988592104 -0400 | |
4 | @@ -196,7 +196,7 @@ | |
59f0d218 FF |
5 | temporarily_use_uid(pw); |
6 | ||
7 | /* Allocate a buffer for the socket name, and format the name. */ | |
8 | - auth_sock_dir = xstrdup("/tmp/ssh-XXXXXXXXXX"); | |
9 | + auth_sock_dir = xstrdup("@TERMUX_PREFIX@/tmp/ssh-XXXXXXXXXX"); | |
10 | ||
11 | /* Create private directory for socket */ | |
12 | if (mkdtemp(auth_sock_dir) == NULL) { | |
dd9da8b3 | 13 | @@ -939,7 +939,7 @@ |
59f0d218 FF |
14 | f = fopen(login_getcapstr(lc, "welcome", "/etc/motd", |
15 | "/etc/motd"), "r"); | |
16 | #else | |
17 | - f = fopen("/etc/motd", "r"); | |
18 | + f = fopen("@TERMUX_PREFIX@/etc/motd", "r"); | |
19 | #endif | |
20 | if (f) { | |
21 | while (fgets(buf, sizeof(buf), f)) | |
dd9da8b3 FF |
22 | @@ -1242,6 +1242,15 @@ |
23 | if (getenv("TZ")) | |
24 | child_set_env(&env, &envsize, "TZ", getenv("TZ")); | |
25 | ||
59f0d218 | 26 | +#ifdef __ANDROID__ |
194d5509 | 27 | + char const* envs_to_keep[] = {"LD_LIBRARY_PATH", "PATH", "ANDROID_ROOT", "ANDROID_DATA", "EXTERNAL_STORAGE", "LANG", "PREFIX"}; |
dd9da8b3 FF |
28 | + for (i = 0; i < (sizeof(envs_to_keep) / sizeof(envs_to_keep[0])); i++) { |
29 | + char const* env_to_keep_name = envs_to_keep[i]; | |
30 | + char const* env_to_keep_value = getenv(env_to_keep_name); | |
31 | + if (env_to_keep_value) child_set_env(&env, &envsize, env_to_keep_name, env_to_keep_value); | |
32 | + } | |
59f0d218 | 33 | +#endif |
dd9da8b3 FF |
34 | + |
35 | /* Set custom environment options from RSA authentication. */ | |
36 | if (!options.use_login) { | |
37 | while (custom_environment) { | |
38 | @@ -1664,7 +1673,9 @@ | |
59f0d218 FF |
39 | * Close any extra file descriptors. Note that there may still be |
40 | * descriptors left by system functions. They will be closed later. | |
41 | */ | |
42 | +#ifndef __ANDROID__ | |
43 | endpwent(); | |
44 | +#endif | |
45 | ||
46 | /* | |
47 | * Close any extra open file descriptors so that we don't have them |