| 1 | diff -u -r ../openssh-6.4p1/misc.c ./misc.c |
| 2 | --- ../openssh-6.4p1/misc.c 2013-08-08 04:50:06.000000000 +0200 |
| 3 | +++ ./misc.c 2014-02-03 03:58:35.000000000 +0100 |
| 4 | @@ -205,7 +205,7 @@ |
| 5 | struct passwd *copy = xcalloc(1, sizeof(*copy)); |
| 6 | |
| 7 | copy->pw_name = xstrdup(pw->pw_name); |
| 8 | - copy->pw_passwd = xstrdup(pw->pw_passwd); |
| 9 | + copy->pw_passwd = pw->pw_passwd == NULL ? "*" : xstrdup(pw->pw_passwd); |
| 10 | #ifdef HAVE_STRUCT_PASSWD_PW_GECOS |
| 11 | copy->pw_gecos = xstrdup(pw->pw_gecos); |
| 12 | #endif |
| 13 | @@ -948,7 +948,7 @@ |
| 14 | if (r > 0 && (size_t)r < len) |
| 15 | return; |
| 16 | } |
| 17 | - r = snprintf(s, len, "/tmp/ssh-XXXXXXXXXXXX"); |
| 18 | + r = snprintf(s, len, "@TERMUX_PREFIX@/tmp/ssh-XXXXXXXXXXXX"); |
| 19 | if (r < 0 || (size_t)r >= len) |
| 20 | fatal("%s: template string too short", __func__); |
| 21 | } |