On Wed, 2003-03-05 at 07:14, Alexander Larsson wrote: > I got a deadlock. I think this fixes it: > --- sftp-method.c.deadlock 2003-03-05 12:28:35.000000000 +0100 > +++ sftp-method.c 2003-03-05 12:30:22.000000000 +0100 > @@ -1653,6 +1653,7 @@ > if (status != SSH2_FX_OK) { > buffer_free (&msg); > g_free (write_req); > + sftp_connection_unlock (handle->connection); > return sftp_status_to_vfs_result (status); > } > > @@ -1752,8 +1753,10 @@ > if (options & GNOME_VFS_FILE_INFO_FOLLOW_LINKS) { > res = get_real_path (conn, path, &real_path); > > - if (res != GNOME_VFS_OK) > + if (res != GNOME_VFS_OK) { > + sftp_connection_unlock (conn); > return res; > + } > } > else > real_path = path; > > > The error handling when you've note got the key for the server in > ssh-agent needs to be better too. Sorry for taking so long to get back to you. I applied your patch -- thanks. I am unclear what you mean by this last statement. I tested cases where the server key is not in known_hosts, where the user's public key is not on the server's authorized_keys, and where the user's public key is on the server's authorized_keys but the private key is not loaded into ssh-agent. All seemed to work for me in the sense that the error messages reported seem to be appropriate. What specific trouble are you having? With the resolution of this issue, I think I will put out 0.1.3 unless there are other pending problems. What are your thoughts on including this in gnome-vfs? Thanks. -- Bradford Hovinen http://www.math.uwaterloo.ca/~bghovinen/ School of Computer Science Email: bghovinen math uwaterloo ca University of Waterloo Office: Davis Centre 3527 Waterloo, ON, N2L 3G1 Canada Phone: (519) 888-4567 x3581
Attachment:
signature.asc
Description: This is a digitally signed message part