diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-08 03:39:17 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-08 03:39:17 +0200 |
commit | 717ef3867a22a5f7427a04083da6cc0b50353bd2 (patch) | |
tree | aa7a2470c56e988f2403e84bf95d1e6ddd87f882 /source3/include/vfs.h | |
parent | f8a02a1a804fdb8640989595e2b57df86281c0f7 (diff) | |
parent | 859facda89ff3589e87c4cbe1708578769d7c535 (diff) | |
download | samba-717ef3867a22a5f7427a04083da6cc0b50353bd2.tar.gz samba-717ef3867a22a5f7427a04083da6cc0b50353bd2.tar.bz2 samba-717ef3867a22a5f7427a04083da6cc0b50353bd2.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/include/vfs.h')
-rw-r--r-- | source3/include/vfs.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 9b72f69328..a3d38f6a25 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -108,8 +108,9 @@ /* Leave at 22 - not yet released. Remove parameter fd from close_fn. - obnox */ /* 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. */ -#define SMB_VFS_INTERFACE_VERSION 23 +#define SMB_VFS_INTERFACE_VERSION 24 /* to bug old modules which are trying to compile with the old functions */ @@ -365,7 +366,7 @@ struct vfs_ops { NTSTATUS (*fset_nt_acl)(struct vfs_handle_struct *handle, struct files_struct *fsp, uint32 security_info_sent, - struct security_descriptor *psd); + const struct security_descriptor *psd); /* POSIX ACL operations. */ |