summaryrefslogtreecommitdiff
path: root/standalone/android
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-03-10 16:50:56 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-03-10 16:50:56 -0400
commit22667fd081dd5d6bcf43ca672d4b9f5db873cdb0 (patch)
tree247260c2d45f77e3ee91adba0dea18ab50993a45 /standalone/android
parent0fef5e83b050d89b77fd38689e347ae933032114 (diff)
patch out another file perm check that does not make sense on android
Diffstat (limited to 'standalone/android')
-rw-r--r--standalone/android/openssh.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/standalone/android/openssh.patch b/standalone/android/openssh.patch
index 6cdb29596..996143d0e 100644
--- a/standalone/android/openssh.patch
+++ b/standalone/android/openssh.patch
@@ -29,6 +29,18 @@ index 6623e0f..dd10253 100644
comparehome = 1;
/* check the open file to avoid races */
+diff --git a/authfile.c b/authfile.c
+index 7dd4496..00462e9 100644
+--- a/authfile.c
++++ b/authfile.c
+@@ -613,6 +613,7 @@ int
+ key_perm_ok(int fd, const char *filename)
+ {
+ struct stat st;
++ return 1; /* check doesn't make sense on android */
+
+ if (fstat(fd, &st) < 0)
+ return 0;
diff --git a/misc.c b/misc.c
index 0bf2db6..4327d03 100644
--- a/misc.c