diff options
| author | Chris Browet <koying@semperpax.com> | 2013-10-20 09:11:17 -0700 |
|---|---|---|
| committer | Chris Browet <koying@semperpax.com> | 2013-10-20 09:11:17 -0700 |
| commit | 388b0f3bc82a2ff112c4560e8ebf038d0b214426 (patch) | |
| tree | 2aaaf8b2ea5c71bdeed90d2c4474aa37dd223511 | |
| parent | 7ca44c80c6afb7965cde407accf6b7e234f4aa3d (diff) | |
| parent | 8a3db3e1c1686ce99f4f2fff465ae800ea3cb041 (diff) | |
Merge pull request #3469 from koying/fixdroidsftp
FIX: [droid] (re-)fix sftp/ssh
| -rw-r--r-- | tools/depends/target/libssh/android.patch | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/tools/depends/target/libssh/android.patch b/tools/depends/target/libssh/android.patch index f9e028bd38..96bafd8550 100644 --- a/tools/depends/target/libssh/android.patch +++ b/tools/depends/target/libssh/android.patch @@ -14,22 +14,17 @@ --- src/misc.c 2011-05-31 10:29:52.000000000 -0400 +++ src/misc.c 2013-01-03 00:37:37.652737345 -0500 -@@ -208,6 +208,14 @@ +@@ -208,6 +208,9 @@ char *ssh_get_user_home_dir(void) { char *szPath = NULL; +#ifdef ANDROID -+ struct passwd *pwd = NULL; -+ pwd = getpwuid(getuid()); -+ if ( pwd == NULL) -+ return NULL; -+ -+ szPath = strdup(pwd->pw_dir); ++ return strdup(getenv("HOME")); +#else struct passwd pwd; struct passwd *pwdbuf; char buf[NSS_BUFLEN_PASSWD]; -@@ -219,7 +227,7 @@ +@@ -219,7 +222,7 @@ } szPath = strdup(pwd.pw_dir); @@ -38,7 +33,7 @@ return szPath; } -@@ -233,6 +241,19 @@ +@@ -233,6 +236,19 @@ } char *ssh_get_local_username(ssh_session session) { @@ -58,7 +53,7 @@ struct passwd pwd; struct passwd *pwdbuf; char buf[NSS_BUFLEN_PASSWD]; -@@ -248,6 +269,7 @@ +@@ -248,6 +264,7 @@ name = strdup(pwd.pw_name); |