summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-06-02 23:39:05 +0200
committerGünther Deschner <gd@samba.org>2010-06-03 11:00:24 +0200
commit1bed5254d9ee28d1efc98f32f5a407ae4359803d (patch)
tree0e23c0558d37cefd2ce794829e10c0620b3d8e69 /source3
parenta75436e3ee11fa1491bfa574523269be716fc892 (diff)
downloadsamba-1bed5254d9ee28d1efc98f32f5a407ae4359803d.tar.gz
samba-1bed5254d9ee28d1efc98f32f5a407ae4359803d.tar.bz2
samba-1bed5254d9ee28d1efc98f32f5a407ae4359803d.zip
s3-security: remove duplicate Extra W2K flags.
Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/include/rpc_secdes.h14
-rw-r--r--source3/smbd/posix_acls.c2
2 files changed, 5 insertions, 11 deletions
diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index 1eefbc92da..a0bc32ca72 100644
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -24,18 +24,12 @@
/* for ADS */
#define SEC_RIGHTS_FULL_CTRL 0xf01ff
-/* Extra W2K flags. */
-#define UNPROTECTED_SACL_SECURITY_INFORMATION 0x10000000
-#define UNPROTECTED_DACL_SECURITY_INFORMATION 0x20000000
-#define PROTECTED_SACL_SECURITY_INFORMATION 0x40000000
-#define PROTECTED_DACL_SECURITY_INFORMATION 0x80000000
-
#define ALL_SECURITY_INFORMATION (SECINFO_OWNER|SECINFO_GROUP|\
SECINFO_DACL|SECINFO_SACL|\
- UNPROTECTED_SACL_SECURITY_INFORMATION|\
- UNPROTECTED_DACL_SECURITY_INFORMATION|\
- PROTECTED_SACL_SECURITY_INFORMATION|\
- PROTECTED_DACL_SECURITY_INFORMATION)
+ SECINFO_UNPROTECTED_SACL|\
+ SECINFO_UNPROTECTED_DACL|\
+ SECINFO_PROTECTED_SACL|\
+ SECINFO_PROTECTED_DACL)
/* A type to describe the mapping of generic access rights to object
specific access rights. */
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index a809b909b3..2f2c90161c 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3206,7 +3206,7 @@ static NTSTATUS posix_get_nt_acl_common(struct connection_struct *conn,
num_profile_acls = 3;
}
- if ((security_info & SECINFO_DACL) && !(security_info & PROTECTED_DACL_SECURITY_INFORMATION)) {
+ if ((security_info & SECINFO_DACL) && !(security_info & SECINFO_PROTECTED_DACL)) {
/*
* In the optimum case Creator Owner and Creator Group would be used for