s3-security: remove some more shared secdesc defines.

Guenther

diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index e21767eba645f4b45f43413f61d76e307fccf09c..0badd0a4788244c66c9aeffb13d14f8a44a5b4ad 100644 (file)
--- 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 d56a8e9db5f54e4fa8368ecaead4814a4ec5c2b5..36d18b013c01cb4f72d7adacd444265674390962 100644 (file)
--- 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;