diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-11-18 03:41:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:58 -0500 |
| commit | 82da254ece1e09218d12b478e2164461306499a3 (patch) | |
| tree | 85552dae9a90a6b6500fb06b4e3bfb47b2379535 /source4/ntvfs | |
| parent | bc7b4abc3a85e78a73d401345265b2c022f0f04d (diff) | |
| download | samba-82da254ece1e09218d12b478e2164461306499a3.tar.gz samba-82da254ece1e09218d12b478e2164461306499a3.tar.bz2 samba-82da254ece1e09218d12b478e2164461306499a3.zip | |
r3833: NTACL is a better xattr name than DosAcl (tpot suggested this)
(This used to be commit 17911eea5995c12a2300dd3928612c77f8f0883e)
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_acl.c | 10 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_xattr.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c index 2885604311..ba92cdc31c 100644 --- a/source4/ntvfs/posix/pvfs_acl.c +++ b/source4/ntvfs/posix/pvfs_acl.c @@ -33,7 +33,7 @@ static NTSTATUS pvfs_default_acl(struct pvfs_state *pvfs, struct smbsrv_request *req, struct pvfs_filename *name, int fd, - struct xattr_DosAcl *acl) + struct xattr_NTACL *acl) { struct security_descriptor *sd; struct nt_user_token *token = req->session->session_info->nt_user_token; @@ -103,12 +103,12 @@ NTSTATUS pvfs_acl_set(struct pvfs_state *pvfs, struct pvfs_filename *name, int fd, union smb_setfileinfo *info) { - struct xattr_DosAcl *acl; + struct xattr_NTACL *acl; uint32_t secinfo_flags = info->set_secdesc.in.secinfo_flags; struct security_descriptor *new_sd, *sd; NTSTATUS status; - acl = talloc_p(req, struct xattr_DosAcl); + acl = talloc_p(req, struct xattr_NTACL); if (acl == NULL) { return NT_STATUS_NO_MEMORY; } @@ -159,11 +159,11 @@ NTSTATUS pvfs_acl_query(struct pvfs_state *pvfs, struct pvfs_filename *name, int fd, union smb_fileinfo *info) { - struct xattr_DosAcl *acl; + struct xattr_NTACL *acl; NTSTATUS status; struct security_descriptor *sd; - acl = talloc_p(req, struct xattr_DosAcl); + acl = talloc_p(req, struct xattr_NTACL); if (acl == NULL) { return NT_STATUS_NO_MEMORY; } diff --git a/source4/ntvfs/posix/pvfs_xattr.c b/source4/ntvfs/posix/pvfs_xattr.c index a50348ef04..35d06e3fb6 100644 --- a/source4/ntvfs/posix/pvfs_xattr.c +++ b/source4/ntvfs/posix/pvfs_xattr.c @@ -353,7 +353,7 @@ NTSTATUS pvfs_streams_save(struct pvfs_state *pvfs, struct pvfs_filename *name, load the current ACL from extended attributes */ NTSTATUS pvfs_acl_load(struct pvfs_state *pvfs, struct pvfs_filename *name, int fd, - struct xattr_DosAcl *acl) + struct xattr_NTACL *acl) { NTSTATUS status; ZERO_STRUCTP(acl); @@ -363,7 +363,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_DOSACL_NAME, acl, - (ndr_pull_flags_fn_t)ndr_pull_xattr_DosAcl); + (ndr_pull_flags_fn_t)ndr_pull_xattr_NTACL); return status; } @@ -371,7 +371,7 @@ NTSTATUS pvfs_acl_load(struct pvfs_state *pvfs, struct pvfs_filename *name, int save the acl for a file into filesystem xattr */ NTSTATUS pvfs_acl_save(struct pvfs_state *pvfs, struct pvfs_filename *name, int fd, - struct xattr_DosAcl *acl) + struct xattr_NTACL *acl) { NTSTATUS status; void *privs; @@ -386,7 +386,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_DOSACL_NAME, acl, - (ndr_push_flags_fn_t)ndr_push_xattr_DosAcl); + (ndr_push_flags_fn_t)ndr_push_xattr_NTACL); talloc_free(privs); return status; } |