From a8b01d1f3b4025af7e7a9d8b61deec6156737322 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 18 May 2010 03:25:38 +0200 Subject: s3-secdesc: remove "typedef struct security_ace SEC_ACE". Guenther --- source3/utils/sharesec.c | 25 +++++++++++++------------ source3/utils/smbcacls.c | 29 +++++++++++++++-------------- 2 files changed, 28 insertions(+), 26 deletions(-) (limited to 'source3/utils') diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c index 00b6975bf0..d4d381c95f 100644 --- a/source3/utils/sharesec.c +++ b/source3/utils/sharesec.c @@ -64,7 +64,7 @@ static const struct perm_value standard_values[] = { print an ACE on a FILE ********************************************************************/ -static void print_ace(FILE *f, SEC_ACE *ace) +static void print_ace(FILE *f, struct security_ace *ace) { const struct perm_value *v; int do_print = 0; @@ -138,7 +138,7 @@ static void sec_desc_print(FILE *f, SEC_DESC *sd) /* Print aces */ for (i = 0; sd->dacl && i < sd->dacl->num_aces; i++) { - SEC_ACE *ace = &sd->dacl->aces[i]; + struct security_ace *ace = &sd->dacl->aces[i]; fprintf(f, "ACL:"); print_ace(f, ace); fprintf(f, "\n"); @@ -149,7 +149,7 @@ static void sec_desc_print(FILE *f, SEC_DESC *sd) parse an ACE in the same format as print_ace() ********************************************************************/ -static bool parse_ace(SEC_ACE *ace, const char *orig_str) +static bool parse_ace(struct security_ace *ace, const char *orig_str) { char *p; const char *cp; @@ -297,7 +297,7 @@ static bool parse_ace(SEC_ACE *ace, const char *orig_str) static SEC_DESC* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t *sd_size ) { SEC_DESC *sd = NULL; - SEC_ACE *ace; + struct security_ace *ace; SEC_ACL *theacl; int num_ace; const char *pacl; @@ -309,7 +309,7 @@ static SEC_DESC* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t pacl = szACL; num_ace = count_chars( pacl, ',' ) + 1; - if ( !(ace = TALLOC_ZERO_ARRAY( mem_ctx, SEC_ACE, num_ace )) ) + if ( !(ace = TALLOC_ZERO_ARRAY( mem_ctx, struct security_ace, num_ace )) ) return NULL; for ( i=0; inum_aces))) { + if (!(aces = SMB_CALLOC_ARRAY(struct security_ace, 1+(*the_acl)->num_aces))) { return False; } - memcpy(aces, (*the_acl)->aces, (*the_acl)->num_aces * sizeof(SEC_ACE)); - memcpy(aces+(*the_acl)->num_aces, ace, sizeof(SEC_ACE)); + memcpy(aces, (*the_acl)->aces, (*the_acl)->num_aces * sizeof(struct + security_ace)); + memcpy(aces+(*the_acl)->num_aces, ace, sizeof(struct security_ace)); new_ace = make_sec_acl(mem_ctx,(*the_acl)->revision,1+(*the_acl)->num_aces, aces); SAFE_FREE(aces); (*the_acl) = new_ace; @@ -360,7 +361,7 @@ static bool add_ace(TALLOC_CTX *mem_ctx, SEC_ACL **the_acl, SEC_ACE *ace) computer running Windows NT 5.0" if denied ACEs do not appear before allowed ACEs. */ -static int ace_compare(SEC_ACE *ace1, SEC_ACE *ace2) +static int ace_compare(struct security_ace *ace1, struct security_ace *ace2) { if (sec_ace_equal(ace1, ace2)) return 0; @@ -380,7 +381,7 @@ static int ace_compare(SEC_ACE *ace1, SEC_ACE *ace2) if (ace1->size != ace2->size) return ace1->size - ace2->size; - return memcmp(ace1, ace2, sizeof(SEC_ACE)); + return memcmp(ace1, ace2, sizeof(struct security_ace)); } static void sort_acl(SEC_ACL *the_acl) diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index 817b07933b..a8e46123a4 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -267,7 +267,7 @@ static void print_ace_flags(FILE *f, uint8_t flags) } /* print an ACE on a FILE, using either numeric or ascii representation */ -static void print_ace(struct cli_state *cli, FILE *f, SEC_ACE *ace) +static void print_ace(struct cli_state *cli, FILE *f, struct security_ace *ace) { const struct perm_value *v; fstring sidstr; @@ -363,7 +363,7 @@ static bool parse_ace_flags(const char *str, unsigned int *pflags) } /* parse an ACE in the same format as print_ace() */ -static bool parse_ace(struct cli_state *cli, SEC_ACE *ace, +static bool parse_ace(struct cli_state *cli, struct security_ace *ace, const char *orig_str) { char *p; @@ -530,20 +530,21 @@ static bool parse_ace(struct cli_state *cli, SEC_ACE *ace, } /* add an ACE to a list of ACEs in a SEC_ACL */ -static bool add_ace(SEC_ACL **the_acl, SEC_ACE *ace) +static bool add_ace(SEC_ACL **the_acl, struct security_ace *ace) { SEC_ACL *new_ace; - SEC_ACE *aces; + struct security_ace *aces; if (! *the_acl) { return (((*the_acl) = make_sec_acl(talloc_tos(), 3, 1, ace)) != NULL); } - if (!(aces = SMB_CALLOC_ARRAY(SEC_ACE, 1+(*the_acl)->num_aces))) { + if (!(aces = SMB_CALLOC_ARRAY(struct security_ace, 1+(*the_acl)->num_aces))) { return False; } - memcpy(aces, (*the_acl)->aces, (*the_acl)->num_aces * sizeof(SEC_ACE)); - memcpy(aces+(*the_acl)->num_aces, ace, sizeof(SEC_ACE)); + memcpy(aces, (*the_acl)->aces, (*the_acl)->num_aces * sizeof(struct + security_ace)); + memcpy(aces+(*the_acl)->num_aces, ace, sizeof(struct security_ace)); new_ace = make_sec_acl(talloc_tos(),(*the_acl)->revision,1+(*the_acl)->num_aces, aces); SAFE_FREE(aces); (*the_acl) = new_ace; @@ -596,7 +597,7 @@ static SEC_DESC *sec_desc_parse(TALLOC_CTX *ctx, struct cli_state *cli, char *st } if (strncmp(tok,"ACL:", 4) == 0) { - SEC_ACE ace; + struct security_ace ace; if (!parse_ace(cli, &ace, tok+4)) { goto done; } @@ -651,7 +652,7 @@ static void sec_desc_print(struct cli_state *cli, FILE *f, SEC_DESC *sd) /* Print aces */ for (i = 0; sd->dacl && i < sd->dacl->num_aces; i++) { - SEC_ACE *ace = &sd->dacl->aces[i]; + struct security_ace *ace = &sd->dacl->aces[i]; fprintf(f, "ACL:"); print_ace(cli, f, ace); fprintf(f, "\n"); @@ -814,7 +815,7 @@ static int owner_set(struct cli_state *cli, enum chown_mode change_mode, canonical order is specified as "Explicit Deny, Explicit Allow, Inherited ACEs unchanged" */ -static int ace_compare(SEC_ACE *ace1, SEC_ACE *ace2) +static int ace_compare(struct security_ace *ace1, struct security_ace *ace2) { if (sec_ace_equal(ace1, ace2)) return 0; @@ -844,7 +845,7 @@ static int ace_compare(SEC_ACE *ace1, SEC_ACE *ace2) if (ace1->size != ace2->size) return ace1->size - ace2->size; - return memcmp(ace1, ace2, sizeof(SEC_ACE)); + return memcmp(ace1, ace2, sizeof(struct security_ace)); } static void sort_acl(SEC_ACL *the_acl) @@ -1023,7 +1024,7 @@ static int inherit(struct cli_state *cli, const char *filename, string_replace(parentname, '/', '\\'); parent = get_secdesc(cli,parentname); for (i=0;idacl->num_aces;i++) { - SEC_ACE *ace=&parent->dacl->aces[i]; + struct security_ace *ace=&parent->dacl->aces[i]; if ((oldattr & aDIR) == aDIR) { if ((ace->flags & SEC_ACE_FLAG_CONTAINER_INHERIT) == SEC_ACE_FLAG_CONTAINER_INHERIT) { @@ -1051,7 +1052,7 @@ static int inherit(struct cli_state *cli, const char *filename, SEC_ACL *temp=old->dacl; old->dacl=make_sec_acl(talloc_tos(), 3, 0, NULL); for (i=temp->num_aces-1;i>=0;i--) { - SEC_ACE *ace=&temp->aces[i]; + struct security_ace *ace=&temp->aces[i]; /* Remove all ace with INHERITED flag set */ if ((ace->flags & SEC_ACE_FLAG_INHERITED_ACE) != SEC_ACE_FLAG_INHERITED_ACE) { @@ -1072,7 +1073,7 @@ static int inherit(struct cli_state *cli, const char *filename, if (old->dacl) { int i; for (i=0;idacl->num_aces;i++) { - SEC_ACE *ace=&old->dacl->aces[i]; + struct security_ace *ace=&old->dacl->aces[i]; /* Remove INHERITED FLAG from all aces */ ace->flags=ace->flags&(~SEC_ACE_FLAG_INHERITED_ACE); } -- cgit