s3-secdesc: use SD_REVISION from security.idl.

Guenther

diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index b8c286fb0b73f6925858e775a0b4fc16deb4b845..74c22fcd1d94672dacc456a02d8b77e7427b80ff 100644 (file)
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -67,10 +67,6 @@
                                        PROTECTED_SACL_SECURITY_INFORMATION|\
                                        PROTECTED_DACL_SECURITY_INFORMATION)
 
-#ifndef SEC_DESC_REVISION
-#define SEC_DESC_REVISION 0x1
-#endif
-
 /* A type to describe the mapping of generic access rights to object
    specific access rights. */
 

diff --git a/source3/libgpo/gpo_reg.c b/source3/libgpo/gpo_reg.c
index b628748769cb0fcf4a109c30b9d5cdd2ca8acb25..b764eaffabf0f6c7a144dda1d08ff0264aeac556 100644 (file)
--- a/source3/libgpo/gpo_reg.c
+++ b/source3/libgpo/gpo_reg.c
@@ -741,7 +741,7 @@ static WERROR gp_reg_generate_sd(TALLOC_CTX *mem_ctx,
        theacl = make_sec_acl(mem_ctx, NT4_ACL_REVISION, 6, ace);
        W_ERROR_HAVE_NO_MEMORY(theacl);
 
-       *sd = make_sec_desc(mem_ctx, SEC_DESC_REVISION,
+       *sd = make_sec_desc(mem_ctx, SD_REVISION,
                            SEC_DESC_SELF_RELATIVE |
                            SEC_DESC_DACL_AUTO_INHERITED | /* really ? */
                            SEC_DESC_DACL_AUTO_INHERIT_REQ, /* really ? */

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 3201fa5482bb642ee439187a1e40b58af4b618c9..72e7aeb2fd89c112fa3b1819db142a73d350c715 100644 (file)
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -321,7 +321,7 @@ static NTSTATUS smb_get_nt_acl_nfs4_common(const SMB_STRUCT_STAT *sbuf,
        }
 
        DEBUG(10,("after make sec_acl\n"));
-       *ppdesc = make_sec_desc(mem_ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE,
+       *ppdesc = make_sec_desc(mem_ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE,
                                (security_info & OWNER_SECURITY_INFORMATION) ? &sid_owner : NULL,
                                (security_info & GROUP_SECURITY_INFORMATION) ? &sid_group : NULL,
                                NULL, psa, &sd_size);

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 00ba2088161834205cc49b7463b5d07017dd2cdf..46d54c2d81bcd77cacad34d7178b2b336193ccfb 100644 (file)
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -88,7 +88,7 @@ static NTSTATUS parse_acl_blob(const DATA_BLOB *pblob,
 
        switch (xacl.version) {
                case 2:
-                       *ppdesc = make_sec_desc(ctx, SEC_DESC_REVISION,
+                       *ppdesc = make_sec_desc(ctx, SD_REVISION,
                                        xacl.info.sd_hs2->sd->type | SEC_DESC_SELF_RELATIVE,
                                        xacl.info.sd_hs2->sd->owner_sid,
                                        xacl.info.sd_hs2->sd->group_sid,
@@ -100,7 +100,7 @@ static NTSTATUS parse_acl_blob(const DATA_BLOB *pblob,
                        memset(hash, '\0', XATTR_SD_HASH_SIZE);
                        break;
                case 3:
-                       *ppdesc = make_sec_desc(ctx, SEC_DESC_REVISION,
+                       *ppdesc = make_sec_desc(ctx, SD_REVISION,
                                        xacl.info.sd_hs3->sd->type | SEC_DESC_SELF_RELATIVE,
                                        xacl.info.sd_hs3->sd->owner_sid,
                                        xacl.info.sd_hs3->sd->group_sid,

diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index 41af84fb59d81b8c59572cb16736429cd2a1919c..64c8ffc22ecc3b6585bf7cb29a1ab4bdf2802235 100644 (file)
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -642,7 +642,7 @@ static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl,
        if (psa == NULL)
                return 0;
 
-       *ppdesc = make_sec_desc(mem_ctx, SEC_DESC_REVISION,
+       *ppdesc = make_sec_desc(mem_ctx, SD_REVISION,
                                SEC_DESC_SELF_RELATIVE,
                                (security_info & OWNER_SECURITY_INFORMATION)
                                ? &owner_sid : NULL,

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index e05b0da0d8e4f04004daaf7e1867e687caab4e2f..40a727d85317fa662e9353a1e8b9ce0c535c353a 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -393,7 +393,7 @@ static int sec_desc_upg_fn( TDB_CONTEXT *the_tdb, TDB_DATA key,
 
        /* create a new struct security_descriptor with the appropriate owner and group SIDs */
 
-       new_sec = make_sec_desc( ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE,
+       new_sec = make_sec_desc( ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE,
                                 &global_sid_Builtin_Administrators,
                                 &global_sid_Builtin_Administrators,
                                 NULL, NULL, &size_new_sec );
@@ -2693,7 +2693,7 @@ WERROR spoolss_create_default_secdesc(TALLOC_CTX *mem_ctx,
 
        if ((psa = make_sec_acl(mem_ctx, NT4_ACL_REVISION, i, ace)) != NULL) {
                psd = make_sec_desc(mem_ctx,
-                                   SEC_DESC_REVISION,
+                                   SD_REVISION,
                                    SEC_DESC_SELF_RELATIVE,
                                    &global_sid_Builtin_Administrators,
                                    &global_sid_Builtin_Administrators,
@@ -5645,7 +5645,7 @@ static struct sec_desc_buf *construct_default_printer_sdb(TALLOC_CTX *ctx)
           NT5 machine. */
 
        if ((psa = make_sec_acl(ctx, NT4_ACL_REVISION, i, ace)) != NULL) {
-               psd = make_sec_desc(ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE,
+               psd = make_sec_desc(ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE,
                        &global_sid_Builtin_Administrators,
                        &global_sid_Builtin_Administrators,
                        NULL, psa, &sd_size);

diff --git a/source3/registry/reg_dispatcher.c b/source3/registry/reg_dispatcher.c
index 966935392fd711903931f3632013d2f93f3b769d..3d66b161050665758b03428068a408688366e8a4 100644 (file)
--- a/source3/registry/reg_dispatcher.c
+++ b/source3/registry/reg_dispatcher.c
@@ -65,7 +65,7 @@ static WERROR construct_registry_sd(TALLOC_CTX *ctx, struct security_descriptor
                return WERR_NOMEM;
        }
 
-       sd = make_sec_desc(ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE,
+       sd = make_sec_desc(ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE,
                           &global_sid_Builtin_Administrators,
                           &global_sid_System, NULL, theacl,
                           &sd_size);

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index 1264e4b51f2cc4a3f061a5888bae1b138a9896f8..07f0e456e3ca08211bdd57141fe6e92d1942edc2 100644 (file)
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -329,7 +329,7 @@ static struct security_descriptor* parse_acl_string(TALLOC_CTX *mem_ctx, const c
        if ( !(theacl = make_sec_acl( mem_ctx, NT4_ACL_REVISION, num_ace, ace )) )
                return NULL;
 
-       sd = make_sec_desc( mem_ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE,
+       sd = make_sec_desc( mem_ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE,
                NULL, NULL, NULL, theacl, sd_size);
 
        return sd;