diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_acl_nfs4.c | 4 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_acl_xattr.c | 6 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_xattr.c | 18 |
3 files changed, 13 insertions, 15 deletions
diff --git a/source4/ntvfs/posix/pvfs_acl_nfs4.c b/source4/ntvfs/posix/pvfs_acl_nfs4.c index 8824602dea..ea620ba4af 100644 --- a/source4/ntvfs/posix/pvfs_acl_nfs4.c +++ b/source4/ntvfs/posix/pvfs_acl_nfs4.c @@ -47,7 +47,7 @@ static NTSTATUS pvfs_acl_load_nfs4(struct pvfs_state *pvfs, struct pvfs_filename status = pvfs_xattr_ndr_load(pvfs, mem_ctx, name->full_name, fd, NFS4ACL_XATTR_NAME, - acl, ndr_pull_nfs4acl); + acl, (void *) ndr_pull_nfs4acl); if (!NT_STATUS_IS_OK(status)) { talloc_free(acl); return status; @@ -184,7 +184,7 @@ static NTSTATUS pvfs_acl_save_nfs4(struct pvfs_state *pvfs, struct pvfs_filename privs = root_privileges(); status = pvfs_xattr_ndr_save(pvfs, name->full_name, fd, NFS4ACL_XATTR_NAME, - &acl, ndr_push_nfs4acl); + &acl, (void *) ndr_push_nfs4acl); talloc_free(privs); talloc_free(tmp_ctx); diff --git a/source4/ntvfs/posix/pvfs_acl_xattr.c b/source4/ntvfs/posix/pvfs_acl_xattr.c index 87bb6bcb94..dbeee829ed 100644 --- a/source4/ntvfs/posix/pvfs_acl_xattr.c +++ b/source4/ntvfs/posix/pvfs_acl_xattr.c @@ -43,8 +43,7 @@ static NTSTATUS pvfs_acl_load_xattr(struct pvfs_state *pvfs, struct pvfs_filenam status = pvfs_xattr_ndr_load(pvfs, mem_ctx, name->full_name, fd, XATTR_NTACL_NAME, - acl, - (ndr_pull_flags_fn_t)ndr_pull_xattr_NTACL); + acl, (void *) ndr_pull_xattr_NTACL); if (!NT_STATUS_IS_OK(status)) { talloc_free(acl); @@ -83,8 +82,7 @@ static NTSTATUS pvfs_acl_save_xattr(struct pvfs_state *pvfs, struct pvfs_filenam privs = root_privileges(); status = pvfs_xattr_ndr_save(pvfs, name->full_name, fd, XATTR_NTACL_NAME, - &acl, - (ndr_push_flags_fn_t)ndr_push_xattr_NTACL); + &acl, (void *) ndr_push_xattr_NTACL); talloc_free(privs); return status; } diff --git a/source4/ntvfs/posix/pvfs_xattr.c b/source4/ntvfs/posix/pvfs_xattr.c index 1eb7c31868..04ad1786ac 100644 --- a/source4/ntvfs/posix/pvfs_xattr.c +++ b/source4/ntvfs/posix/pvfs_xattr.c @@ -176,8 +176,8 @@ NTSTATUS pvfs_dosattrib_load(struct pvfs_state *pvfs, struct pvfs_filename *name status = pvfs_xattr_ndr_load(pvfs, mem_ctx, name->full_name, fd, XATTR_DOSATTRIB_NAME, - &attrib, - (ndr_pull_flags_fn_t)ndr_pull_xattr_DosAttrib); + &attrib, + (void *) ndr_pull_xattr_DosAttrib); /* not having a DosAttrib is not an error */ if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) { @@ -271,7 +271,7 @@ NTSTATUS pvfs_dosattrib_save(struct pvfs_state *pvfs, struct pvfs_filename *name return pvfs_xattr_ndr_save(pvfs, name->full_name, fd, XATTR_DOSATTRIB_NAME, &attrib, - (ndr_push_flags_fn_t)ndr_push_xattr_DosAttrib); + (void *) ndr_push_xattr_DosAttrib); } @@ -287,7 +287,7 @@ NTSTATUS pvfs_doseas_load(struct pvfs_state *pvfs, struct pvfs_filename *name, i return NT_STATUS_OK; } status = pvfs_xattr_ndr_load(pvfs, eas, name->full_name, fd, XATTR_DOSEAS_NAME, - eas, (ndr_pull_flags_fn_t)ndr_pull_xattr_DosEAs); + eas, (void *) ndr_pull_xattr_DosEAs); if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) { return NT_STATUS_OK; } @@ -304,7 +304,7 @@ NTSTATUS pvfs_doseas_save(struct pvfs_state *pvfs, struct pvfs_filename *name, i return NT_STATUS_OK; } return pvfs_xattr_ndr_save(pvfs, name->full_name, fd, XATTR_DOSEAS_NAME, eas, - (ndr_push_flags_fn_t)ndr_push_xattr_DosEAs); + (void *) ndr_push_xattr_DosEAs); } @@ -322,7 +322,7 @@ NTSTATUS pvfs_streams_load(struct pvfs_state *pvfs, struct pvfs_filename *name, status = pvfs_xattr_ndr_load(pvfs, streams, name->full_name, fd, XATTR_DOSSTREAMS_NAME, streams, - (ndr_pull_flags_fn_t)ndr_pull_xattr_DosStreams); + (void *) ndr_pull_xattr_DosStreams); if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) { return NT_STATUS_OK; } @@ -341,7 +341,7 @@ NTSTATUS pvfs_streams_save(struct pvfs_state *pvfs, struct pvfs_filename *name, return pvfs_xattr_ndr_save(pvfs, name->full_name, fd, XATTR_DOSSTREAMS_NAME, streams, - (ndr_push_flags_fn_t)ndr_push_xattr_DosStreams); + (void *) ndr_push_xattr_DosStreams); } @@ -359,7 +359,7 @@ NTSTATUS pvfs_acl_load(struct pvfs_state *pvfs, struct pvfs_filename *name, int status = pvfs_xattr_ndr_load(pvfs, acl, name->full_name, fd, XATTR_NTACL_NAME, acl, - (ndr_pull_flags_fn_t)ndr_pull_xattr_NTACL); + (void *) ndr_pull_xattr_NTACL); return status; } @@ -382,7 +382,7 @@ NTSTATUS pvfs_acl_save(struct pvfs_state *pvfs, struct pvfs_filename *name, int status = pvfs_xattr_ndr_save(pvfs, name->full_name, fd, XATTR_NTACL_NAME, acl, - (ndr_push_flags_fn_t)ndr_push_xattr_NTACL); + (void *) ndr_push_xattr_NTACL); talloc_free(privs); return status; } |