diff options
| author | Günther Deschner <gd@samba.org> | 2010-06-02 23:22:12 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-06-03 10:59:15 +0200 |
| commit | 415d3d5fe7637e8f9a649665497d3972391750b6 (patch) | |
| tree | 54148725791d128842e9d1926fb3de01cd88f829 /source3/smbd | |
| parent | 788d7f9e4ae76105ee481bde42e2ddb8fdac2617 (diff) | |
| download | samba-415d3d5fe7637e8f9a649665497d3972391750b6.tar.gz samba-415d3d5fe7637e8f9a649665497d3972391750b6.tar.bz2 samba-415d3d5fe7637e8f9a649665497d3972391750b6.zip | |
s3-security: use shared SECINFO_OWNER define.
Guenther
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/file_access.c | 2 | ||||
| -rw-r--r-- | source3/smbd/nttrans.c | 2 | ||||
| -rw-r--r-- | source3/smbd/open.c | 6 | ||||
| -rw-r--r-- | source3/smbd/posix_acls.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c index b487afb5e8..2404bacc38 100644 --- a/source3/smbd/file_access.c +++ b/source3/smbd/file_access.c @@ -42,7 +42,7 @@ bool can_access_file_acl(struct connection_struct *conn, } status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name, - (OWNER_SECURITY_INFORMATION | + (SECINFO_OWNER | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION), &secdesc); diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 577a7e4076..9b838a616d 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -846,7 +846,7 @@ NTSTATUS set_sd(files_struct *fsp, uint8_t *data, uint32_t sd_len, } if (psd->owner_sid == NULL) { - security_info_sent &= ~OWNER_SECURITY_INFORMATION; + security_info_sent &= ~SECINFO_OWNER; } if (psd->group_sid == NULL) { security_info_sent &= ~GROUP_SECURITY_INFORMATION; diff --git a/source3/smbd/open.c b/source3/smbd/open.c index ca5b133ec6..0bec72582a 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -89,7 +89,7 @@ NTSTATUS smbd_check_open_rights(struct connection_struct *conn, struct security_descriptor *sd = NULL; status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name, - (OWNER_SECURITY_INFORMATION | + (SECINFO_OWNER | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION),&sd); @@ -1413,7 +1413,7 @@ static NTSTATUS calculate_access_mask(connection_struct *conn, uint32_t access_granted = 0; status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name, - (OWNER_SECURITY_INFORMATION | + (SECINFO_OWNER | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION),&sd); @@ -3209,7 +3209,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, security_acl_map_generic(sd->dacl, &file_generic_mapping); security_acl_map_generic(sd->sacl, &file_generic_mapping); - if (sec_info_sent & (OWNER_SECURITY_INFORMATION| + if (sec_info_sent & (SECINFO_OWNER| GROUP_SECURITY_INFORMATION| DACL_SECURITY_INFORMATION| SACL_SECURITY_INFORMATION)) { diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 36d18b013c..5fa8f6dc67 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -1197,7 +1197,7 @@ NTSTATUS unpack_nt_owners(struct connection_struct *conn, * This may be a group chown only set. */ - if (security_info_sent & OWNER_SECURITY_INFORMATION) { + if (security_info_sent & SECINFO_OWNER) { sid_copy(&owner_sid, psd->owner_sid); if (!sid_to_uid(&owner_sid, puser)) { if (lp_force_unknown_acl_user(SNUM(conn))) { @@ -3388,7 +3388,7 @@ static NTSTATUS posix_get_nt_acl_common(struct connection_struct *conn, } /* security_info & DACL_SECURITY_INFORMATION */ psd = make_standard_sec_desc( talloc_tos(), - (security_info & OWNER_SECURITY_INFORMATION) ? &owner_sid : NULL, + (security_info & SECINFO_OWNER) ? &owner_sid : NULL, (security_info & GROUP_SECURITY_INFORMATION) ? &group_sid : NULL, psa, &sd_size); |