diff options
| author | Günther Deschner <gd@samba.org> | 2010-06-02 23:16:32 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-06-03 09:58:25 +0200 |
| commit | 788d7f9e4ae76105ee481bde42e2ddb8fdac2617 (patch) | |
| tree | ac50b6cb22f6c3a68302ea7e7f7ef84d4d7c7f7c | |
| parent | cb1590e410a3b8fd366f4670786046566b5f4f9c (diff) | |
| download | samba-788d7f9e4ae76105ee481bde42e2ddb8fdac2617.tar.gz samba-788d7f9e4ae76105ee481bde42e2ddb8fdac2617.tar.bz2 samba-788d7f9e4ae76105ee481bde42e2ddb8fdac2617.zip | |
s3-security: remove some more shared secdesc defines.
Guenther
| -rw-r--r-- | source3/include/rpc_secdes.h | 10 | ||||
| -rw-r--r-- | source3/smbd/posix_acls.c | 6 |
2 files changed, 3 insertions, 13 deletions
diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h index e21767eba6..0badd0a478 100644 --- a/source3/include/rpc_secdes.h +++ b/source3/include/rpc_secdes.h @@ -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 diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index d56a8e9db5..36d18b013c 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -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; |