diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-04-05 01:48:40 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-04-05 01:48:40 +0800 |
| commit | 35ff332d6be173e8729dc77719e759ab825f5229 (patch) | |
| tree | 743d357783eb7ce26cc7fa222e554673700a26d5 /devel/gnomevfs2 | |
| parent | 7e47faafdc9818f2c96133146e087c995b4346e5 (diff) | |
| download | marcuscom-ports-35ff332d6be173e8729dc77719e759ab825f5229.tar marcuscom-ports-35ff332d6be173e8729dc77719e759ab825f5229.tar.gz marcuscom-ports-35ff332d6be173e8729dc77719e759ab825f5229.tar.bz2 marcuscom-ports-35ff332d6be173e8729dc77719e759ab825f5229.tar.lz marcuscom-ports-35ff332d6be173e8729dc77719e759ab825f5229.tar.xz marcuscom-ports-35ff332d6be173e8729dc77719e759ab825f5229.tar.zst marcuscom-ports-35ff332d6be173e8729dc77719e759ab825f5229.zip | |
Add a missing hunk to fix sftp password authentication on 5.X.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2252 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gnomevfs2')
| -rw-r--r-- | devel/gnomevfs2/files/patch-modules_sftp-method.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/devel/gnomevfs2/files/patch-modules_sftp-method.c b/devel/gnomevfs2/files/patch-modules_sftp-method.c index 976a9ad4b..bd08ae0b4 100644 --- a/devel/gnomevfs2/files/patch-modules_sftp-method.c +++ b/devel/gnomevfs2/files/patch-modules_sftp-method.c @@ -1,10 +1,9 @@ ---- modules/sftp-method.c.orig Sat Apr 3 23:58:06 2004 -+++ modules/sftp-method.c Sun Apr 4 00:00:38 2004 -@@ -174,6 +174,15 @@ - /* Inspired by atomicio() from OpenSSH */ +--- modules/sftp-method.c.orig Mon Mar 8 13:52:39 2004 ++++ modules/sftp-method.c Sun Apr 4 13:50:21 2004 +@@ -175,6 +175,15 @@ typedef ssize_t (*read_write_fn) (int, void *, size_t); -+ + +#ifndef TEMP_FAILURE_RETRY +#define TEMP_FAILURE_RETRY(expression) \ + (__extension__ \ @@ -13,6 +12,15 @@ + while (__result == -1L && errno == EINTR); \ + __result; })) +#endif - ++ static gsize atomic_io (read_write_fn f, gint fd, gpointer buffer_in, gsize size) + { +@@ -1072,6 +1081,7 @@ + if (io_status == G_IO_STATUS_NORMAL) { + buffer[len] = 0; + if (g_str_has_suffix (buffer, "password: ") || ++ g_str_has_suffix (buffer, "Password:") || + g_str_has_prefix (buffer, "Enter passphrase for key")) { + if (invoke_full_auth (uri, done_auth, buffer, &password) && password != NULL) { + g_io_channel_write_chars (tty_channel, password, -1, &len, NULL); |