diff options
| author | Günther Deschner <gd@samba.org> | 2010-06-02 23:25:18 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-06-03 10:59:38 +0200 |
| commit | 630c27bdad32086f16dbafdeab94d34fbc3b9b5e (patch) | |
| tree | 91a031718d84014cdfe71dac8f938970a3946d4a /source3/smbd | |
| parent | 415d3d5fe7637e8f9a649665497d3972391750b6 (diff) | |
| download | samba-630c27bdad32086f16dbafdeab94d34fbc3b9b5e.tar.gz samba-630c27bdad32086f16dbafdeab94d34fbc3b9b5e.tar.bz2 samba-630c27bdad32086f16dbafdeab94d34fbc3b9b5e.zip | |
s3-security: use shared SECINFO_GROUP 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 2404bacc38..bd0a725e9d 100644 --- a/source3/smbd/file_access.c +++ b/source3/smbd/file_access.c @@ -43,7 +43,7 @@ bool can_access_file_acl(struct connection_struct *conn, status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name, (SECINFO_OWNER | - GROUP_SECURITY_INFORMATION | + SECINFO_GROUP | DACL_SECURITY_INFORMATION), &secdesc); if (!NT_STATUS_IS_OK(status)) { diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 9b838a616d..85b005f376 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -849,7 +849,7 @@ NTSTATUS set_sd(files_struct *fsp, uint8_t *data, uint32_t sd_len, security_info_sent &= ~SECINFO_OWNER; } if (psd->group_sid == NULL) { - security_info_sent &= ~GROUP_SECURITY_INFORMATION; + security_info_sent &= ~SECINFO_GROUP; } /* Convert all the generic bits. */ diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 0bec72582a..8c9df72cbc 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -90,7 +90,7 @@ NTSTATUS smbd_check_open_rights(struct connection_struct *conn, status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name, (SECINFO_OWNER | - GROUP_SECURITY_INFORMATION | + SECINFO_GROUP | DACL_SECURITY_INFORMATION),&sd); if (!NT_STATUS_IS_OK(status)) { @@ -1414,7 +1414,7 @@ static NTSTATUS calculate_access_mask(connection_struct *conn, status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name, (SECINFO_OWNER | - GROUP_SECURITY_INFORMATION | + SECINFO_GROUP | DACL_SECURITY_INFORMATION),&sd); if (!NT_STATUS_IS_OK(status)) { @@ -3210,7 +3210,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, security_acl_map_generic(sd->sacl, &file_generic_mapping); if (sec_info_sent & (SECINFO_OWNER| - GROUP_SECURITY_INFORMATION| + SECINFO_GROUP| DACL_SECURITY_INFORMATION| SACL_SECURITY_INFORMATION)) { status = SMB_VFS_FSET_NT_ACL(fsp, sec_info_sent, sd); diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 5fa8f6dc67..c6b0cfdeeb 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -1220,7 +1220,7 @@ NTSTATUS unpack_nt_owners(struct connection_struct *conn, * This may be an owner chown only set. */ - if (security_info_sent & GROUP_SECURITY_INFORMATION) { + if (security_info_sent & SECINFO_GROUP) { sid_copy(&grp_sid, psd->group_sid); if (!sid_to_gid( &grp_sid, pgrp)) { if (lp_force_unknown_acl_user(SNUM(conn))) { @@ -3389,7 +3389,7 @@ static NTSTATUS posix_get_nt_acl_common(struct connection_struct *conn, psd = make_standard_sec_desc( talloc_tos(), (security_info & SECINFO_OWNER) ? &owner_sid : NULL, - (security_info & GROUP_SECURITY_INFORMATION) ? &group_sid : NULL, + (security_info & SECINFO_GROUP) ? &group_sid : NULL, psa, &sd_size); |