Some C++ fixes

[samba.git] / source / lib / sharesec.c

diff --git a/source/lib/sharesec.c b/source/lib/sharesec.c
index b3b000579f1b9539320e932aa44e494f741292de..0027a8813ab19c1ac8eb34dd367ba2802c5f1592 100644 (file)
--- a/source/lib/sharesec.c
+++ b/source/lib/sharesec.c
@@ -92,7 +92,9 @@ SEC_DESC *get_share_security_default( TALLOC_CTX *ctx, size_t *psize, uint32 def
        init_sec_ace(&ace, &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED, sa, 0);
 
        if ((psa = make_sec_acl(ctx, NT4_ACL_REVISION, 1, &ace)) != NULL) {
-               psd = make_sec_desc(ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE, NULL, NULL, NULL, psa, psize);
+               psd = make_sec_desc(ctx, SECURITY_DESCRIPTOR_REVISION_1,
+                                   SEC_DESC_SELF_RELATIVE, NULL, NULL, NULL,
+                                   psa, psize);
        }
 
        if (!psd) {
@@ -291,7 +293,7 @@ bool parse_usershare_acl(TALLOC_CTX *ctx, const char *acl_str, SEC_DESC **ppsd)
                uint32 s_access;
                DOM_SID sid;
                char *sidstr;
-               uint8 type = SEC_ACE_TYPE_ACCESS_ALLOWED;
+               enum security_ace_type type = SEC_ACE_TYPE_ACCESS_ALLOWED;
 
                if (!next_token_talloc(ctx, &pacl, &sidstr, ":")) {
                        DEBUG(0,("parse_usershare_acl: malformed usershare acl looking "
@@ -339,7 +341,9 @@ bool parse_usershare_acl(TALLOC_CTX *ctx, const char *acl_str, SEC_DESC **ppsd)
        }
 
        if ((psa = make_sec_acl(ctx, NT4_ACL_REVISION, num_aces, ace_list)) != NULL) {
-               psd = make_sec_desc(ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE, NULL, NULL, NULL, psa, &sd_size);
+               psd = make_sec_desc(ctx, SECURITY_DESCRIPTOR_REVISION_1,
+                                   SEC_DESC_SELF_RELATIVE, NULL, NULL, NULL,
+                                   psa, &sd_size);
        }
 
        if (!psd) {