From a75436e3ee11fa1491bfa574523269be716fc892 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 2 Jun 2010 23:35:44 +0200 Subject: s3-security: use shared SECINFO_DACL define. Guenther --- source3/smbd/file_access.c | 4 ++-- source3/smbd/nttrans.c | 2 +- source3/smbd/open.c | 6 +++--- source3/smbd/posix_acls.c | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c index bd0a725e9d..1d1776218e 100644 --- a/source3/smbd/file_access.c +++ b/source3/smbd/file_access.c @@ -44,7 +44,7 @@ bool can_access_file_acl(struct connection_struct *conn, status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name, (SECINFO_OWNER | SECINFO_GROUP | - DACL_SECURITY_INFORMATION), + SECINFO_DACL), &secdesc); if (!NT_STATUS_IS_OK(status)) { DEBUG(5, ("Could not get acl: %s\n", nt_errstr(status))); @@ -252,7 +252,7 @@ bool directory_has_default_acl(connection_struct *conn, const char *fname) struct security_descriptor *secdesc = NULL; unsigned int i; NTSTATUS status = SMB_VFS_GET_NT_ACL(conn, fname, - DACL_SECURITY_INFORMATION, &secdesc); + SECINFO_DACL, &secdesc); if (!NT_STATUS_IS_OK(status) || secdesc == NULL) { return false; diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 1b34b6ce80..04c32260a9 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -1809,7 +1809,7 @@ NTSTATUS smbd_do_query_security_desc(connection_struct *conn, security_info_wanted & SECINFO_SACL) psd->type |= SEC_DESC_SACL_PRESENT; if (psd->dacl == NULL && - security_info_wanted & DACL_SECURITY_INFORMATION) + security_info_wanted & SECINFO_DACL) psd->type |= SEC_DESC_DACL_PRESENT; *psd_size = ndr_size_security_descriptor(psd, 0); diff --git a/source3/smbd/open.c b/source3/smbd/open.c index f6905eaaa1..4fc464d8ab 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -91,7 +91,7 @@ NTSTATUS smbd_check_open_rights(struct connection_struct *conn, status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name, (SECINFO_OWNER | SECINFO_GROUP | - DACL_SECURITY_INFORMATION),&sd); + SECINFO_DACL),&sd); if (!NT_STATUS_IS_OK(status)) { DEBUG(10, ("smbd_check_open_rights: Could not get acl " @@ -1415,7 +1415,7 @@ static NTSTATUS calculate_access_mask(connection_struct *conn, status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name, (SECINFO_OWNER | SECINFO_GROUP | - DACL_SECURITY_INFORMATION),&sd); + SECINFO_DACL),&sd); if (!NT_STATUS_IS_OK(status)) { DEBUG(10, ("calculate_access_mask: Could not get acl " @@ -3211,7 +3211,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, if (sec_info_sent & (SECINFO_OWNER| SECINFO_GROUP| - DACL_SECURITY_INFORMATION| + SECINFO_DACL| SECINFO_SACL)) { 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 c6b0cfdeeb..a809b909b3 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -2337,7 +2337,7 @@ static bool unpack_canon_ace(files_struct *fsp, * If no DACL then this is a chown only security descriptor. */ - if(!(security_info_sent & DACL_SECURITY_INFORMATION) || !psd->dacl) + if(!(security_info_sent & SECINFO_DACL) || !psd->dacl) return True; /* @@ -3206,7 +3206,7 @@ static NTSTATUS posix_get_nt_acl_common(struct connection_struct *conn, num_profile_acls = 3; } - if ((security_info & DACL_SECURITY_INFORMATION) && !(security_info & PROTECTED_DACL_SECURITY_INFORMATION)) { + if ((security_info & SECINFO_DACL) && !(security_info & PROTECTED_DACL_SECURITY_INFORMATION)) { /* * In the optimum case Creator Owner and Creator Group would be used for @@ -3385,7 +3385,7 @@ static NTSTATUS posix_get_nt_acl_common(struct connection_struct *conn, goto done; } } - } /* security_info & DACL_SECURITY_INFORMATION */ + } /* security_info & SECINFO_DACL */ psd = make_standard_sec_desc( talloc_tos(), (security_info & SECINFO_OWNER) ? &owner_sid : NULL, @@ -3682,7 +3682,7 @@ NTSTATUS append_parent_acl(files_struct *fsp, } status = SMB_VFS_GET_NT_ACL(parent_fsp->conn, smb_dname->base_name, - DACL_SECURITY_INFORMATION, &parent_sd ); + SECINFO_DACL, &parent_sd ); close_file(NULL, parent_fsp, NORMAL_CLOSE); TALLOC_FREE(smb_dname); @@ -3937,7 +3937,7 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 security_info_sent, const struct s * Only change security if we got a DACL. */ - if(!(security_info_sent & DACL_SECURITY_INFORMATION) || (psd->dacl == NULL)) { + if(!(security_info_sent & SECINFO_DACL) || (psd->dacl == NULL)) { free_canon_ace_list(file_ace_list); free_canon_ace_list(dir_ace_list); return NT_STATUS_OK; @@ -4747,7 +4747,7 @@ struct security_descriptor *get_nt_acl_no_snum( TALLOC_CTX *ctx, const char *fna return NULL; } - if (!NT_STATUS_IS_OK(SMB_VFS_FGET_NT_ACL( &finfo, DACL_SECURITY_INFORMATION, &psd))) { + if (!NT_STATUS_IS_OK(SMB_VFS_FGET_NT_ACL( &finfo, SECINFO_DACL, &psd))) { DEBUG(0,("get_nt_acl_no_snum: get_nt_acl returned zero.\n")); TALLOC_FREE(finfo.fsp_name); conn_free(conn); -- cgit