summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-06-02 23:45:14 +0200
committerGünther Deschner <gd@samba.org>2010-06-03 11:00:25 +0200
commit5cf3b0bba4b45096390fb4bcfb3ad07704d56880 (patch)
treed7c8796844cbdee442559bfb7b40fedbbddc57a8
parent1bed5254d9ee28d1efc98f32f5a407ae4359803d (diff)
downloadsamba-5cf3b0bba4b45096390fb4bcfb3ad07704d56880.tar.gz
samba-5cf3b0bba4b45096390fb4bcfb3ad07704d56880.tar.bz2
samba-5cf3b0bba4b45096390fb4bcfb3ad07704d56880.zip
s3-security: move ALL_SECURITY_INFORMATION to the only user.
Guenther
-rw-r--r--source3/include/rpc_secdes.h7
-rw-r--r--source3/lib/secdesc.c7
2 files changed, 7 insertions, 7 deletions
diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index a0bc32ca72..16791e072c 100644
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -24,13 +24,6 @@
/* for ADS */
#define SEC_RIGHTS_FULL_CTRL 0xf01ff
-#define ALL_SECURITY_INFORMATION (SECINFO_OWNER|SECINFO_GROUP|\
- SECINFO_DACL|SECINFO_SACL|\
- 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/lib/secdesc.c b/source3/lib/secdesc.c
index 8cabe0b5f5..b9ed955dee 100644
--- a/source3/lib/secdesc.c
+++ b/source3/lib/secdesc.c
@@ -23,6 +23,13 @@
#include "includes.h"
#include "../librpc/gen_ndr/ndr_security.h"
+#define ALL_SECURITY_INFORMATION (SECINFO_OWNER|SECINFO_GROUP|\
+ SECINFO_DACL|SECINFO_SACL|\
+ SECINFO_UNPROTECTED_SACL|\
+ SECINFO_UNPROTECTED_DACL|\
+ SECINFO_PROTECTED_SACL|\
+ SECINFO_PROTECTED_DACL)
+
/* Map generic permissions to file object specific permissions */
const struct generic_mapping file_generic_mapping = {