summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-14 02:34:38 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-14 02:34:38 +0200
commit4c81727a003e4c49c314e0c5a1b4584b8825e7fe (patch)
tree8267f7e5dca6b82984b51cca9735dc9d1e5852e6
parenta62c510d8b3f5e15bd48f71747c5f516eca570c7 (diff)
parent501fa6a05db1b2c29b1e4720a03ed219aee2a346 (diff)
downloadsamba-4c81727a003e4c49c314e0c5a1b4584b8825e7fe.tar.gz
samba-4c81727a003e4c49c314e0c5a1b4584b8825e7fe.tar.bz2
samba-4c81727a003e4c49c314e0c5a1b4584b8825e7fe.zip
Merge branch 'master' of git://git.samba.org/samba
-rw-r--r--source3/include/vfs.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 0951de63fe..4cedb4a9c6 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 */