diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-10-10 16:44:41 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-10-11 12:25:11 +1100 |
| commit | 1f36ec129300e4f69efe26d4950fe3a7cfbfb233 (patch) | |
| tree | 217c35df446b5882d5d5aab3046082f6d5043e43 /source3/include | |
| parent | c8ade07760ae0ccfdf2d875c9f3027926e62321b (diff) | |
| download | samba-1f36ec129300e4f69efe26d4950fe3a7cfbfb233.tar.gz samba-1f36ec129300e4f69efe26d4950fe3a7cfbfb233.tar.bz2 samba-1f36ec129300e4f69efe26d4950fe3a7cfbfb233.zip | |
vfs: Remove type parameter from sys_acl_blob_get_{fd,file}
This interface actually needs to match the get_nt_acl interface in
that the system ACL implmenetation may not be posix ACLs, and the blob
is not meant to be enforced to be of a particular system ACL
structure.
Andrew Bartlett
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/vfs.h | 10 | ||||
| -rw-r--r-- | source3/include/vfs_macros.h | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 2d18265aac..2992c1db32 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -146,6 +146,7 @@ /* Leave at 29 - not yet released. Added sys_acl_blob_get_file and sys_acl_blob_get_fd */ /* Bump to version 30 - Samba 4.0.0 will ship with interface version 30 */ /* Leave at 30 - not yet released. Added conn->cwd to save vfs_GetWd() calls. */ +/* Leave at 30 - not yet released. Changed sys_acl_blob_get_file interface to remove type */ #define SMB_VFS_INTERFACE_VERSION 30 /* @@ -701,10 +702,12 @@ struct vfs_fn_pointers { SMB_ACL_T (*sys_acl_get_fd_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, TALLOC_CTX *mem_ctx); - int (*sys_acl_blob_get_file_fn)(struct vfs_handle_struct *handle, const char *path_p, SMB_ACL_TYPE_T type, - TALLOC_CTX *mem_ctx, char **blob_description, + int (*sys_acl_blob_get_file_fn)(struct vfs_handle_struct *handle, + const char *path_p, + TALLOC_CTX *mem_ctx, + char **blob_description, DATA_BLOB *blob); - int (*sys_acl_blob_get_fd_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, + int (*sys_acl_blob_get_fd_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, TALLOC_CTX *mem_ctx, char **blob_description, DATA_BLOB *blob); int (*sys_acl_set_file_fn)(struct vfs_handle_struct *handle, const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); @@ -1110,7 +1113,6 @@ SMB_ACL_T smb_vfs_call_sys_acl_get_fd(struct vfs_handle_struct *handle, TALLOC_CTX *mem_ctx); int smb_vfs_call_sys_acl_blob_get_file(struct vfs_handle_struct *handle, const char *path_p, - SMB_ACL_TYPE_T type, TALLOC_CTX *mem_ctx, char **blob_description, DATA_BLOB *blob); diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index a5ff90bc9d..331fe001be 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -439,10 +439,10 @@ #define SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp, mem_ctx) \ smb_vfs_call_sys_acl_get_fd((handle)->next, (fsp), (mem_ctx)) -#define SMB_VFS_SYS_ACL_BLOB_GET_FILE(conn, path_p, type, mem_ctx, blob_description, blob) \ - smb_vfs_call_sys_acl_blob_get_file((conn)->vfs_handles, (path_p), (type), (mem_ctx), (blob_description), (blob)) -#define SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, path_p, type, mem_ctx, blob_description, blob) \ - smb_vfs_call_sys_acl_blob_get_file((handle)->next, (path_p), (type), (mem_ctx), (blob_description), (blob)) +#define SMB_VFS_SYS_ACL_BLOB_GET_FILE(conn, path_p, mem_ctx, blob_description, blob) \ + smb_vfs_call_sys_acl_blob_get_file((conn)->vfs_handles, (path_p), (mem_ctx), (blob_description), (blob)) +#define SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, path_p, mem_ctx, blob_description, blob) \ + smb_vfs_call_sys_acl_blob_get_file((handle)->next, (path_p), (mem_ctx), (blob_description), (blob)) #define SMB_VFS_SYS_ACL_BLOB_GET_FD(fsp, mem_ctx, blob_description, blob) \ smb_vfs_call_sys_acl_blob_get_fd((fsp)->conn->vfs_handles, (fsp), (mem_ctx), (blob_description), (blob)) |