Merge branch 'master' of github.com:libfuse/sshfs

2 files changed, 18 insertions, 0 deletions

diff --git a/README.md b/README.md
index 8913bd6..56a4d72 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,9 @@ To unmount the filesystem:
 
     fusermount -u mountpoint
 
+On macOS, to unmount the filesystem:
+
+    umount mountpoint
 
 Installing
 ==========
diff --git a/sshfs.c b/sshfs.c
index 8cde971..3edd1ab 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -297,6 +297,7 @@ static const char *ssh_opts[] = {
 	"AddressFamily",
 	"BatchMode",
 	"BindAddress",
+	"CertificateFile",
 	"ChallengeResponseAuthentication",
 	"CheckHostIP",
 	"Cipher",
@@ -307,28 +308,40 @@ static const char *ssh_opts[] = {
 	"ConnectTimeout",
 	"ControlMaster",
 	"ControlPath",
+	"ControlPersist",
+	"FingerprintHash",
 	"GlobalKnownHostsFile",
 	"GSSAPIAuthentication",
 	"GSSAPIDelegateCredentials",
 	"HostbasedAuthentication",
+	"HostbasedKeyTypes",
 	"HostKeyAlgorithms",
 	"HostKeyAlias",
 	"HostName",
 	"IdentitiesOnly",
 	"IdentityFile",
+	"IdentityAgent",
+	"IPQoS",
 	"KbdInteractiveAuthentication",
 	"KbdInteractiveDevices",
+	"KexAlgorithms",
 	"LocalCommand",
 	"LogLevel",
 	"MACs",
 	"NoHostAuthenticationForLocalhost",
 	"NumberOfPasswordPrompts",
 	"PasswordAuthentication",
+	"PermitLocalCommand",
+	"PKCS11Provider",
 	"Port",
 	"PreferredAuthentications",
 	"ProxyCommand",
+	"ProxyJump",
+	"ProxyUseFdpass",
+	"PubkeyAcceptedKeyTypes"
 	"PubkeyAuthentication",
 	"RekeyLimit",
+	"RevokedHostKeys",
 	"RhostsRSAAuthentication",
 	"RSAAuthentication",
 	"ServerAliveCountMax",
@@ -336,9 +349,11 @@ static const char *ssh_opts[] = {
 	"SmartcardDevice",
 	"StrictHostKeyChecking",
 	"TCPKeepAlive",
+	"UpdateHostKeys",
 	"UsePrivilegedPort",
 	"UserKnownHostsFile",
 	"VerifyHostKeyDNS",
+	"VisualHostKey",
 	NULL,
 };