sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-29 13:49:30 +03:00
Code Activity

s3-security: remove some more shared secdesc defines.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner
2010-06-02 23:16:32 +02:00
parent cb1590e410
commit 788d7f9e4a
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source3/include/rpc_secdes.h
View File

@ -24,16 +24,6 @@
/* for ADS */
#define SEC_RIGHTS_FULL_CTRL 0xf01ff
/*
* New Windows 2000 bits.
*/
#define SE_DESC_DACL_AUTO_INHERIT_REQ 0x0100
#define SE_DESC_SACL_AUTO_INHERIT_REQ 0x0200
#define SE_DESC_DACL_AUTO_INHERITED 0x0400
#define SE_DESC_SACL_AUTO_INHERITED 0x0800
#define SE_DESC_DACL_PROTECTED 0x1000
#define SE_DESC_SACL_PROTECTED 0x2000
/* security information */
#define OWNER_SECURITY_INFORMATION 0x00000001
#define GROUP_SECURITY_INFORMATION 0x00000002

6
source3/smbd/posix_acls.c
View File

@ -475,7 +475,7 @@ static struct pai_val *create_pai_val_v1(const char *buf, size_t size)
memset(paiv, '\0', sizeof(struct pai_val));
paiv->sd_type = (CVAL(buf,PAI_V1_FLAG_OFFSET) == PAI_V1_ACL_FLAG_PROTECTED) ?
SE_DESC_DACL_PROTECTED : 0;
SEC_DESC_DACL_PROTECTED : 0;
paiv->num_entries = SVAL(buf,PAI_V1_NUM_ENTRIES_OFFSET);
paiv->num_def_entries = SVAL(buf,PAI_V1_NUM_DEFAULT_ENTRIES_OFFSET);
@ -3813,8 +3813,8 @@ NTSTATUS append_parent_acl(files_struct *fsp,
psd->dacl->aces = new_ace;
psd->dacl->num_aces = i;
psd->type &= ~(SE_DESC_DACL_AUTO_INHERITED|
SE_DESC_DACL_AUTO_INHERIT_REQ);
psd->type &= ~(SEC_DESC_DACL_AUTO_INHERITED|
SEC_DESC_DACL_AUTO_INHERIT_REQ);
*pp_new_sd = psd;
return status;