gnome-vfs2-samba.patch

   1 diff -u -r1.387 configure.in
   2 --- configure.in        24 Aug 2005 07:45:44 -0000      1.387
   3 +++ configure.in        2 Sep 2005 11:28:23 -0000
   4 @@ -517,6 +517,9 @@
   5                 AC_CHECK_MEMBER(SMBCCTX.flags,
   6                                 [AC_DEFINE(HAVE_SAMBA_FLAGS,, [Defined if flags availible in SMBCCTXT])],,
   7                                 [#include <libsmbclient.h>])
   8 +               AC_CHECK_MEMBER(SMBCCTX.close,
   9 +                               [AC_DEFINE(HAVE_SAMBA_OLD_CLOSE, , [Defined if old close is available in SMBCCTXT])],,
  10 +                               [#include <libsmbclient.h>])
  11                 CPPFLAGS="$CPPFLAGS_save"
  12         else
  13                 SAMBA_CFLAGS=""
  14 Index: modules/smb-method.c
  15 ===================================================================
  16 RCS file: /cvs/gnome/gnome-vfs/modules/smb-method.c,v
  17 retrieving revision 1.33
  18 diff -u -r1.33 smb-method.c
  19 --- modules/smb-method.c        24 May 2005 16:41:44 -0000      1.33
  20 +++ modules/smb-method.c        2 Sep 2005 11:28:25 -0000
  21 @@ -1486,7 +1486,11 @@
  22
  23                 /* Important: perform_authentication leaves and re-enters the lock! */
  24                 while (perform_authentication (&actx) > 0) {
  25 +#ifdef HAVE_SAMBA_OLD_CLOSE
  26                         r = smb_context->close (smb_context, handle->file);
  27 +#else
  28 +                       r = smb_context->close_fn (smb_context, handle->file);
  29 +#endif
  30                         actx.res = (r >= 0) ? GNOME_VFS_OK : gnome_vfs_result_from_errno ();
  31                 }
  32