Hi, A patch to fix GNU-TLS support in gnome-vfs was committed right before the hard code freeze. Before the commit of this patch, gnome-vfs compilation would error out when GNU-TLS support was enabled from configure (GNU-TLS is disabled by default). Unfortunately, the patch which was committed has a obvious few bugs in it, it doesn't compile and has a few = and == mixups. So we'd like to break the freeze to fix the bugs which were spotted. The corresponding bug number is #151350, and the patch is attached to this mail. Thanks, Christophe
Index: gnome-vfs-ssl.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-ssl.c,v
retrieving revision 1.23
diff -u -r1.23 gnome-vfs-ssl.c
--- gnome-vfs-ssl.c 29 Aug 2004 22:52:13 -0000 1.23
+++ gnome-vfs-ssl.c 30 Aug 2004 14:39:27 -0000
@@ -396,7 +396,7 @@
res = GNOME_VFS_ERROR_IO;
err = gnutls_handshake (ssl->private->tlsstate);
- if (ret == GNUTLS_E_INTERRUPTED || ret = GNUTLS_E_AGAIN) {
+ if (err == GNUTLS_E_INTERRUPTED || err == GNUTLS_E_AGAIN) {
res = handle_ssl_read_write (ssl->private->sockfd,
gnutls_record_get_direction (ssl->private->tlsstate),
@@ -488,8 +488,8 @@
return GNOME_VFS_OK;
}
- retry:
res = GNOME_VFS_OK;
+retry:
ret = gnutls_record_recv (ssl->private->tlsstate, buffer, bytes);
if (ret == 0) {
@@ -498,7 +498,7 @@
res = GNOME_VFS_ERROR_IO;
- if (ret == GNUTLS_E_INTERRUPTED || ret = GNUTLS_E_AGAIN) {
+ if (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN) {
res = handle_ssl_read_write (ssl->private->sockfd,
gnutls_record_get_direction (ssl->private->tlsstate),
ssl->private->timeout,
@@ -581,8 +581,8 @@
return GNOME_VFS_OK;
}
- retry:
res = GNOME_VFS_OK;
+retry:
ret = gnutls_record_send (ssl->private->tlsstate, buffer, bytes);
if (ret == 0) {
@@ -591,7 +591,7 @@
res = GNOME_VFS_ERROR_IO;
- if (ret == GNUTLS_E_INTERRUPTED || ret = GNUTLS_E_AGAIN) {
+ if (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN) {
res = handle_ssl_read_write (ssl->private->sockfd,
gnutls_record_get_direction (ssl->private->tlsstate),
ssl->private->timeout,
Attachment:
signature.asc
Description: Ceci est une partie de message =?ISO-8859-1?Q?num=E9riquement?= =?ISO-8859-1?Q?_sign=E9e?=