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/modules | |
| 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/modules')
| -rw-r--r-- | source3/modules/vfs_full_audit.c | 3 | ||||
| -rw-r--r-- | source3/modules/vfs_time_audit.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index be8989cdb5..b1fb090dc6 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -1835,14 +1835,13 @@ static SMB_ACL_T smb_full_audit_sys_acl_get_fd(vfs_handle_struct *handle, static int smb_full_audit_sys_acl_blob_get_file(vfs_handle_struct *handle, const char *path_p, - SMB_ACL_TYPE_T type, TALLOC_CTX *mem_ctx, char **blob_description, DATA_BLOB *blob) { int result; - result = SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, path_p, type, mem_ctx, blob_description, blob); + result = SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, path_p, mem_ctx, blob_description, blob); do_log(SMB_VFS_OP_SYS_ACL_BLOB_GET_FILE, (result >= 0), handle, "%s", path_p); diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c index 6ff1a5571d..95b4148232 100644 --- a/source3/modules/vfs_time_audit.c +++ b/source3/modules/vfs_time_audit.c @@ -1818,7 +1818,6 @@ static SMB_ACL_T smb_time_audit_sys_acl_get_fd(vfs_handle_struct *handle, static int smb_time_audit_sys_acl_blob_get_file(vfs_handle_struct *handle, const char *path_p, - SMB_ACL_TYPE_T type, TALLOC_CTX *mem_ctx, char **blob_description, DATA_BLOB *blob) @@ -1828,7 +1827,7 @@ static int smb_time_audit_sys_acl_blob_get_file(vfs_handle_struct *handle, double timediff; clock_gettime_mono(&ts1); - result = SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, path_p, type, mem_ctx, blob_description, blob); + result = SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, path_p, mem_ctx, blob_description, blob); clock_gettime_mono(&ts2); timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9; |