aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2011-10-21 17:12:31 +0200
committerBenjamin Fleischer <fleiben@gmail.com>2012-01-22 10:45:06 +0100
commitd8da0c4ed6fcb336c93503fd980b930de547470f (patch)
tree086abbb9884c4ebe05cf891bbbb579b9da505ef5
parent163683d9ef91f5f338dd62788ea75c23ebca67de (diff)
downloadsshfs-d8da0c4ed6fcb336c93503fd980b930de547470f.tar
sshfs-d8da0c4ed6fcb336c93503fd980b930de547470f.tar.gz
sshfs-d8da0c4ed6fcb336c93503fd980b930de547470f.tar.bz2
sshfs-d8da0c4ed6fcb336c93503fd980b930de547470f.zip
Remove "-oPreferredAuthentications" from ssh options
Remove "-oPreferredAuthentications" from ssh options if the "password_stdin" option is used. Reported by E. Kuemmerle
-rw-r--r--ChangeLog5
-rw-r--r--sshfs.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fb3088f..5d25cbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-21 Miklos Szeredi <miklos@szeredi.hu>
+
+ * Remove "-oPreferredAuthentications" from ssh options if the
+ "password_stdin" option is used. Reported by E. Kuemmerle
+
2011-08-24 Miklos Szeredi <miklos@szeredi.hu>
* Add "-oworkaround=fstat" for SFTP servers which don't support
diff --git a/sshfs.c b/sshfs.c
index 1d4a1b1..74d0e71 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -3237,7 +3237,6 @@ static int read_password(void)
}
sshfs.password[n+1] = '\0';
ssh_add_arg("-oNumberOfPasswordPrompts=1");
- ssh_add_arg("-oPreferredAuthentications=password,keyboard-interactive");
return 0;
}