[SCM] Samba Shared Repository - branch master updated - 501fa6a05db1b2c29b1e4720a03ed219aee2a346

[Jeremy Allison]

The branch, master has been updated
       via  501fa6a05db1b2c29b1e4720a03ed219aee2a346 (commit)
       via  ddf16ed6e5d68870cdf3b8c6358af5134a694fc4 (commit)
      from  7e5bbe806958ea8176e4c8494e3b3f79570635da (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 501fa6a05db1b2c29b1e4720a03ed219aee2a346
Merge: ddf16ed6e5d68870cdf3b8c6358af5134a694fc4 7e5bbe806958ea8176e4c8494e3b3f79570635da
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Oct 13 17:27:53 2008 -0700

    Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba

commit ddf16ed6e5d68870cdf3b8c6358af5134a694fc4
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Oct 13 17:22:33 2008 -0700

    Cope with VFS change.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/include/vfs.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 0951de6..4cedb4a 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -109,8 +109,9 @@
 /* Changed to version 23 - remove set_nt_acl call. This can only be done via an
    open handle. JRA. */
 /* Changed to version 24 - make security descriptor const in fset_nt_acl. JRA. */
+/* Changed to version 25 - Jelmer's change from SMB_BIG_UINT to uint64_t. */
 
-#define SMB_VFS_INTERFACE_VERSION 24
+#define SMB_VFS_INTERFACE_VERSION 25
 
 
 /* to bug old modules which are trying to compile with the old functions */


-- 
Samba Shared Repository