diff options
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/profiles.c | 2 | ||||
| -rw-r--r-- | source3/utils/sharesec.c | 10 | ||||
| -rw-r--r-- | source3/utils/smbcacls.c | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c index 499f7bd758..ff82fbd10a 100644 --- a/source3/utils/profiles.c +++ b/source3/utils/profiles.c @@ -58,7 +58,7 @@ static void verbose_output(const char *format, ...) static bool swap_sid_in_acl( SEC_DESC *sd, DOM_SID *s1, DOM_SID *s2 ) { - SEC_ACL *theacl; + struct security_acl *theacl; int i; bool update = False; diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c index d4d381c95f..da8dfa28b7 100644 --- a/source3/utils/sharesec.c +++ b/source3/utils/sharesec.c @@ -298,7 +298,7 @@ static SEC_DESC* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t { SEC_DESC *sd = NULL; struct security_ace *ace; - SEC_ACL *theacl; + struct security_acl *theacl; int num_ace; const char *pacl; int i; @@ -335,10 +335,10 @@ static SEC_DESC* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t return sd; } -/* add an ACE to a list of ACEs in a SEC_ACL */ -static bool add_ace(TALLOC_CTX *mem_ctx, SEC_ACL **the_acl, struct security_ace *ace) +/* add an ACE to a list of ACEs in a struct security_acl */ +static bool add_ace(TALLOC_CTX *mem_ctx, struct security_acl **the_acl, struct security_ace *ace) { - SEC_ACL *new_ace; + struct security_acl *new_ace; struct security_ace *aces; if (! *the_acl) { return (((*the_acl) = make_sec_acl(mem_ctx, 3, 1, ace)) != NULL); @@ -384,7 +384,7 @@ static int ace_compare(struct security_ace *ace1, struct security_ace *ace2) return memcmp(ace1, ace2, sizeof(struct security_ace)); } -static void sort_acl(SEC_ACL *the_acl) +static void sort_acl(struct security_acl *the_acl) { uint32 i; if (!the_acl) return; diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index a8e46123a4..f4307e3870 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -529,10 +529,10 @@ static bool parse_ace(struct cli_state *cli, struct security_ace *ace, return True; } -/* add an ACE to a list of ACEs in a SEC_ACL */ -static bool add_ace(SEC_ACL **the_acl, struct security_ace *ace) +/* add an ACE to a list of ACEs in a struct security_acl */ +static bool add_ace(struct security_acl **the_acl, struct security_ace *ace) { - SEC_ACL *new_ace; + struct security_acl *new_ace; struct security_ace *aces; if (! *the_acl) { return (((*the_acl) = make_sec_acl(talloc_tos(), 3, 1, ace)) @@ -559,7 +559,7 @@ static SEC_DESC *sec_desc_parse(TALLOC_CTX *ctx, struct cli_state *cli, char *st SEC_DESC *ret = NULL; size_t sd_size; DOM_SID *grp_sid=NULL, *owner_sid=NULL; - SEC_ACL *dacl=NULL; + struct security_acl *dacl=NULL; int revision=1; while (next_token_talloc(ctx, &p, &tok, "\t,\r\n")) { @@ -848,7 +848,7 @@ static int ace_compare(struct security_ace *ace1, struct security_ace *ace2) return memcmp(ace1, ace2, sizeof(struct security_ace)); } -static void sort_acl(SEC_ACL *the_acl) +static void sort_acl(struct security_acl *the_acl) { uint32 i; if (!the_acl) return; @@ -1049,7 +1049,7 @@ static int inherit(struct cli_state *cli, const char *filename, /* remove all inherited ACL's. */ if (old->dacl) { int i; - SEC_ACL *temp=old->dacl; + struct security_acl *temp=old->dacl; old->dacl=make_sec_acl(talloc_tos(), 3, 0, NULL); for (i=temp->num_aces-1;i>=0;i--) { struct security_ace *ace=&temp->aces[i]; |