[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1164-gc69f92d

[Tim Prouty]

Hi Jeremy,

On Aug 24, 2009, at 8:58 PM, Jeremy Allison wrote:

> The branch, master has been updated
>       via  c69f92d16d57c2387d31b5dfd01aab0685a671d0 (commit)
>      from  9a86f26a5f0b421f8cf259e579fe5946b39623f6 (commit)
>
> http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
>
>
> - Log  
> -----------------------------------------------------------------
> commit c69f92d16d57c2387d31b5dfd01aab0685a671d0
> Author: Jeremy Allison <jra at samba.org>
> Date:   Mon Aug 24 20:57:37 2009 -0700
>
>    Second attempt at fix for bug 6529 - Offline files conflict with  
> Vista and Office 2003.
>    Confirmation from reporter that this fixes the issue in master on  
> ext3/ext4.
>    Back-ports to follow.
>    Jeremy.
>
> -----------------------------------------------------------------------
>
> diff --git a/source3/include/vfs.h b/source3/include/vfs.h
> index 2722352..38a972f 100644
> --- a/source3/include/vfs.h
> +++ b/source3/include/vfs.h
> @@ -121,8 +121,9 @@
> /* Changed to version 26 - Plumb struct smb_filename to  
> SMB_VFS_CREATE_FILE,
> 			   SMB_VFS_OPEN, SMB_VFS_STAT, SMB_VFS_LSTAT,
> 			   SMB_VFS_RENAME, SMB_VFS_UNLINK, SMB_VFS_NTIMES.  */
> -
> -#define SMB_VFS_INTERFACE_VERSION 26
> +/* Changed to version 27 - not yet released. Added enum  
> timestamp_set_resolution
> + * 			   return to fs_capabilities call. JRA. */
> +#define SMB_VFS_INTERFACE_VERSION 27

This is minor, but you should be able to leave the interface version  
at 26 since there hasn't been a release since it was incremented to 26.

-Tim