diff options
| author | Volker Lendecke <vl@samba.org> | 2007-12-20 22:27:01 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2007-12-21 09:58:21 +0100 |
| commit | 99b86e4a266b99634f6a65015f6df115c421d3e5 (patch) | |
| tree | 80d4826f844551ec2b3be8a84b896a8ed3acc203 /source3/lib/sharesec.c | |
| parent | addf598cde41d17ad4cf497a64b9a2b27e4028c5 (diff) | |
| download | samba-99b86e4a266b99634f6a65015f6df115c421d3e5.tar.gz samba-99b86e4a266b99634f6a65015f6df115c421d3e5.tar.bz2 samba-99b86e4a266b99634f6a65015f6df115c421d3e5.zip | |
Some C++ fixes
(This used to be commit 5c392c4c6e277a24d0d477902dc7856b2b46ee53)
Diffstat (limited to 'source3/lib/sharesec.c')
| -rw-r--r-- | source3/lib/sharesec.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c index b3b000579f..0027a8813a 100644 --- a/source3/lib/sharesec.c +++ b/source3/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) { |