diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.10.1/config.h.in gnome-vfs-2.10.1.fixed/config.h.in --- gnome-vfs-2.10.1/config.h.in 2005-04-11 03:07:33.000000000 -0400 +++ gnome-vfs-2.10.1.fixed/config.h.in 2005-09-02 15:19:13.000000000 -0400 @@ -253,6 +253,9 @@ /* Defined if flags availible in SMBCCTXT */ #undef HAVE_SAMBA_FLAGS +/* Defined if close_fn is in SMBCCTXT instead of close */ +#undef HAVE_SAMBA_CLOSE_FN + /* Define to 1 if you have the `setegid' function. */ #undef HAVE_SETEGID diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.10.1/configure.in gnome-vfs-2.10.1.fixed/configure.in --- gnome-vfs-2.10.1/configure.in 2005-03-31 21:28:41.000000000 -0500 +++ gnome-vfs-2.10.1.fixed/configure.in 2005-09-02 14:54:27.000000000 -0400 @@ -541,6 +541,9 @@ AC_CHECK_MEMBER(SMBCCTX.flags, [AC_DEFINE(HAVE_SAMBA_FLAGS,, [Defined if flags availible in SMBCCTXT])],, [#include ]) + AC_CHECK_MEMBER(SMBCCTX.close_fn, + [AC_DEFINE(HAVE_SAMBA_CLOSE_FN,, [Defined if close_fn used in SMBCCTXT instead of close])],, + [#include ]) CPPFLAGS="$CPPFLAGS_save" else SAMBA_CFLAGS="" diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.10.1/modules/smb-method.c gnome-vfs-2.10.1.fixed/modules/smb-method.c --- gnome-vfs-2.10.1/modules/smb-method.c 2005-03-02 18:44:11.000000000 -0500 +++ gnome-vfs-2.10.1.fixed/modules/smb-method.c 2005-09-02 14:57:00.000000000 -0400 @@ -1425,7 +1425,11 @@ /* Important: perform_authentication leaves and re-enters the lock! */ while (perform_authentication (&actx) > 0) { +#ifndef HAVE_SAMBA_CLOSE_FN r = smb_context->close (smb_context, handle->file); +#else /* HAVE_SAMBA_CLOSE_FN */ + r = smb_context->close_fn (smb_context, handle->file); +#endif /* HAVE_SAMBA_CLOSE_FN */ actx.res = (r >= 0) ? GNOME_VFS_OK : gnome_vfs_result_from_errno (); }