From 2164685b9f959814af2067aa0dcac2d1b2ac0bc5 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 13 Nov 1998 02:07:07 +0000 Subject: include/smb.h: Re-added zero pointer protection to ZERO_STRUCTP. lib/util_sock.c: Added strerror() calls to getpeername failures (which seem to be giving IRIX trouble at the moment). rpc_parse/parse_sec.c: Changed use of ZERO_STRUCTPN to ZERO_STRUCTP which again does zero pointer protection. smbd/quotas.c: Fixed typo. Jeremy. (This used to be commit b62f008974c96e0302d6c146cf49bc2045bef005) --- source3/rpc_parse/parse_sec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source3/rpc_parse/parse_sec.c') diff --git a/source3/rpc_parse/parse_sec.c b/source3/rpc_parse/parse_sec.c index 0b0c08fe13..c802f9c2d1 100644 --- a/source3/rpc_parse/parse_sec.c +++ b/source3/rpc_parse/parse_sec.c @@ -149,7 +149,7 @@ void sec_io_acl(char *desc, SEC_ACL *t, prs_struct *ps, int depth) { /* reading */ t->ace = malloc(sizeof(t->ace[0]) * t->num_aces); - ZERO_STRUCTPN(t->ace); + ZERO_STRUCTP(t->ace); } if (t->ace == NULL && t->num_aces != 0) @@ -316,7 +316,7 @@ static void sec_io_desc(char *desc, SEC_DESC *t, prs_struct *ps, int depth) { /* reading */ t->dacl = malloc(sizeof(*t->dacl)); - ZERO_STRUCTPN(t->dacl); + ZERO_STRUCTP(t->dacl); } if (t->dacl == NULL) @@ -348,7 +348,7 @@ static void sec_io_desc(char *desc, SEC_DESC *t, prs_struct *ps, int depth) { /* reading */ t->sacl = malloc(sizeof(*t->sacl)); - ZERO_STRUCTPN(t->sacl); + ZERO_STRUCTP(t->sacl); } if (t->sacl == NULL) @@ -383,7 +383,7 @@ static void sec_io_desc(char *desc, SEC_DESC *t, prs_struct *ps, int depth) { /* reading */ t->owner_sid = malloc(sizeof(*t->owner_sid)); - ZERO_STRUCTPN(t->owner_sid); + ZERO_STRUCTP(t->owner_sid); } if (t->owner_sid == NULL) @@ -412,7 +412,7 @@ static void sec_io_desc(char *desc, SEC_DESC *t, prs_struct *ps, int depth) { /* reading */ t->grp_sid = malloc(sizeof(*t->grp_sid)); - ZERO_STRUCTPN(t->grp_sid); + ZERO_STRUCTP(t->grp_sid); } if (t->grp_sid == NULL) @@ -485,7 +485,7 @@ void sec_io_desc_buf(char *desc, SEC_DESC_BUF *sec, prs_struct *ps, int depth) { /* reading */ sec->sec = malloc(sizeof(*sec->sec)); - ZERO_STRUCTPN(sec->sec); + ZERO_STRUCTP(sec->sec); if (sec->sec == NULL) { -- cgit