Bug#596122: unblock: gvfs/1.6.3-2

[Josselin Mouette <joss@debian.org>]

Le samedi 02 octobre 2010 à 12:48 +0200, Josselin Mouette a écrit : 
> Major changes in 1.6.4 
> ======================
> * Lots of translation updates
> * afc: Add support for photo thumbnails on iOS4
> * daemons: Move GConf initialization from backend constructor
> * sftp: Use poll() to cope with openssh-5.6 changes
> 
> The OpenSSH change is not necessary per se since we ship 5.5

More than unnecessary, it is broken (for both 5.5 and 5.6).

I just uploaded 1.6.4-2 with the attached fix. Sorry for all the mess.

Cheers,
-- 
 .''`.      Josselin Mouette
: :' :
`. `'  “If you behave this way because you are blackmailed by someone,
  `-    […] I will see what I can do for you.”  -- Jörg Schilling

From 2b779633f48f3099205a81737cf601939289fa73 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andreas@fatal.se>
Date: Sat, 2 Oct 2010 14:51:54 +0200
Subject: [PATCH] sftp: fix poll() timeout.

When switching from select() to poll() in commit
"sftp: Use poll() to cope with openssh-5.6 changes" (c6be45c8934)
the difference in seconds vs milliseconds for select/poll timeout
argument was missed.

SFTP_READ_TIMEOUT is defined in seconds, so multiply it with 1000
when using it with poll().

https://bugzilla.gnome.org/show_bug.cgi?id=631169
---
 daemon/gvfsbackendsftp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
index 9fecf6a..f6b7785 100644
--- a/daemon/gvfsbackendsftp.c
+++ b/daemon/gvfsbackendsftp.c
@@ -869,7 +869,7 @@ handle_login (GVfsBackend *backend,
       fds[1].fd = prompt_fd;
       fds[1].events = POLLIN;
       
-      ret = poll(fds, 2, SFTP_READ_TIMEOUT);
+      ret = poll(fds, 2, SFTP_READ_TIMEOUT * 1000);
       
       if (ret <= 0)
         {
-- 
1.7.1

Attachment: signature.asc
Description: This is a digitally signed message part