summaryrefslogtreecommitdiff
path: root/standalone/android/openssh.patch
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-04 16:00:02 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-04 16:00:02 -0400
commit603e70ab3f89404cdd9d43080990c04da96d92da (patch)
tree59f03996e1addfd407a95cbdf459004de286c072 /standalone/android/openssh.patch
parentb4f750fd1d2143c3c1f4737b08511a463f0e6571 (diff)
prevent openssh from checking config file permissions
Android features filesystems with a variety of insane and wonderful default permissions, such as ----rwxr-x
Diffstat (limited to 'standalone/android/openssh.patch')
-rw-r--r--standalone/android/openssh.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/standalone/android/openssh.patch b/standalone/android/openssh.patch
index 7305bdafb..6cdb29596 100644
--- a/standalone/android/openssh.patch
+++ b/standalone/android/openssh.patch
@@ -85,6 +85,19 @@ index b7b9d91..3c10b11 100644
#endif
/*
+diff --git a/readconf.c b/readconf.c
+index 097bb05..dcbc008 100644
+--- a/readconf.c
++++ b/readconf.c
+@@ -1085,7 +1085,7 @@ read_config_file(const char *filename, const char *host, Options *options,
+ if ((f = fopen(filename, "r")) == NULL)
+ return 0;
+
+- if (checkperm) {
++ if (checkperm && 0) {
+ struct stat sb;
+
+ if (fstat(fileno(f), &sb) == -1)
diff --git a/ssh-add.c b/ssh-add.c
index 738644d..f6fce4a 100644
--- a/ssh-add.c