From ddc9b8b40642c90fe7c34b088eae4f8075f4033a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 10 May 2000 09:49:55 +0000 Subject: more merging it is now at the stage that winbindd can compile in the head branch, but not link (This used to be commit d178c00aae77710ae6ff20a7f54a30e3bd8232bb) --- source3/rpc_parse/parse_sec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/rpc_parse') diff --git a/source3/rpc_parse/parse_sec.c b/source3/rpc_parse/parse_sec.c index 541949e51e..5d4b56d745 100644 --- a/source3/rpc_parse/parse_sec.c +++ b/source3/rpc_parse/parse_sec.c @@ -137,13 +137,13 @@ SEC_ACL *make_sec_acl(uint16 revision, int num_aces, SEC_ACE *ace_list) dst->num_aces = num_aces; dst->size = 8; - if((dst->ace_list = (SEC_ACE *)malloc( sizeof(SEC_ACE) * num_aces )) == NULL) { + if((dst->ace = (SEC_ACE *)malloc( sizeof(SEC_ACE) * num_aces )) == NULL) { free_sec_acl(&dst); return NULL; } for (i = 0; i < num_aces; i++) { - dst->ace_list[i] = ace_list[i]; /* Structure copy. */ + dst->ace[i] = ace_list[i]; /* Structure copy. */ dst->size += ace_list[i].size; } @@ -159,7 +159,7 @@ SEC_ACL *dup_sec_acl( SEC_ACL *src) if(src == NULL) return NULL; - return make_sec_acl( src->revision, src->num_aces, src->ace_list); + return make_sec_acl( src->revision, src->num_aces, src->ace); } /******************************************************************* @@ -174,8 +174,8 @@ void free_sec_acl(SEC_ACL **ppsa) return; psa = *ppsa; - if (psa->ace_list != NULL) - free(psa->ace_list); + if (psa->ace != NULL) + free(psa->ace); free(psa); *ppsa = NULL; @@ -229,15 +229,15 @@ BOOL sec_io_acl(char *desc, SEC_ACL **ppsa, prs_struct *ps, int depth) if (UNMARSHALLING(ps) && psa->num_aces != 0) { /* reading */ - if((psa->ace_list = malloc(sizeof(psa->ace_list[0]) * psa->num_aces)) == NULL) + if((psa->ace = malloc(sizeof(psa->ace[0]) * psa->num_aces)) == NULL) return False; - ZERO_STRUCTP(psa->ace_list); + ZERO_STRUCTP(psa->ace); } for (i = 0; i < psa->num_aces; i++) { fstring tmp; slprintf(tmp, sizeof(tmp)-1, "ace_list[%02d]: ", i); - if(!sec_io_ace(tmp, &psa->ace_list[i], ps, depth)) + if(!sec_io_ace(tmp, &psa->ace[i], ps, depth)) return False; } -- cgit