Commit | Line | Data |
---|---|---|
c7ce60b7 FF |
1 | diff -u -r ../openssh-7.5p1/session.c ./session.c |
2 | --- ../openssh-7.5p1/session.c 2017-03-20 03:39:27.000000000 +0100 | |
3 | +++ ./session.c 2017-06-30 22:51:57.404787949 +0200 | |
4 | @@ -194,7 +194,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) { | |
c7ce60b7 | 13 | @@ -756,7 +756,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)) | |
c7ce60b7 FF |
22 | @@ -1047,8 +1047,10 @@ |
23 | # endif /* HAVE_CYGWIN */ | |
24 | #endif /* HAVE_LOGIN_CAP */ | |
25 | ||
26 | +#ifdef _PATH_MAILDIR | |
27 | snprintf(buf, sizeof buf, "%.200s/%.50s", _PATH_MAILDIR, pw->pw_name); | |
28 | child_set_env(&env, &envsize, "MAIL", buf); | |
29 | +#endif | |
30 | ||
31 | /* Normal systems set SHELL by default. */ | |
32 | child_set_env(&env, &envsize, "SHELL", shell); | |
33 | @@ -1056,6 +1058,15 @@ | |
dd9da8b3 FF |
34 | if (getenv("TZ")) |
35 | child_set_env(&env, &envsize, "TZ", getenv("TZ")); | |
36 | ||
59f0d218 | 37 | +#ifdef __ANDROID__ |
194d5509 | 38 | + char const* envs_to_keep[] = {"LD_LIBRARY_PATH", "PATH", "ANDROID_ROOT", "ANDROID_DATA", "EXTERNAL_STORAGE", "LANG", "PREFIX"}; |
dd9da8b3 FF |
39 | + for (i = 0; i < (sizeof(envs_to_keep) / sizeof(envs_to_keep[0])); i++) { |
40 | + char const* env_to_keep_name = envs_to_keep[i]; | |
41 | + char const* env_to_keep_value = getenv(env_to_keep_name); | |
42 | + if (env_to_keep_value) child_set_env(&env, &envsize, env_to_keep_name, env_to_keep_value); | |
43 | + } | |
59f0d218 | 44 | +#endif |
dd9da8b3 FF |
45 | + |
46 | /* Set custom environment options from RSA authentication. */ | |
c7ce60b7 FF |
47 | while (custom_environment) { |
48 | struct envstring *ce = custom_environment; |