diff options
| author | Mayank Sharma <mayank8019@gmail.com> | 2019-03-26 07:00:30 +0530 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2019-03-27 07:31:58 +0000 |
| commit | 1ec32698618f20620122581ee55c87598f74480d (patch) | |
| tree | 515da4ba8950ea50c97b554cd4fa2ce4885fc1ee | |
| parent | 278ce739649f2580f9cb767b00a5e7cc4143697a (diff) | |
| download | gvfs-1ec32698618f20620122581ee55c87598f74480d.tar.gz | |
Revert "sftp: Always use port 22 if not specified"
This reverts commit 1a38caf8bcb4e02b68f8062319ef7736796a7e64
as it breaks "bookmarks" from `ssh_config`.
https://gitlab.gnome.org/GNOME/gvfs/issues/382
| -rw-r--r-- | daemon/gvfsbackendsftp.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c index 2314579f..48603852 100644 --- a/daemon/gvfsbackendsftp.c +++ b/daemon/gvfsbackendsftp.c @@ -1134,7 +1134,7 @@ handle_login (GVfsBackend *backend, "sftp", object, authtype, - op_backend->port != 22 ? + op_backend->port != -1 ? op_backend->port : 0, @@ -1330,7 +1330,7 @@ handle_login (GVfsBackend *backend, "sftp", object, authtype, - op_backend->port != 22 ? + op_backend->port != -1 ? op_backend->port : 0, @@ -1995,7 +1995,7 @@ do_mount (GVfsBackend *backend, if (op_backend->user_specified_in_uri) g_mount_spec_set (sftp_mount_spec, "user", op_backend->user); g_mount_spec_set (sftp_mount_spec, "host", op_backend->host); - if (op_backend->port != 22) + if (op_backend->port != -1) { char *v; v = g_strdup_printf ("%d", op_backend->port); @@ -2065,10 +2065,12 @@ try_mount (GVfsBackend *backend, } port = g_mount_spec_get (mount_spec, "port"); - op_backend->port = 22; + op_backend->port = -1; if (port != NULL) { - op_backend->port = atoi (port); + int p = atoi (port); + if (p != 22) + op_backend->port = p; } user = g_mount_spec_get (mount_spec, "user"); |