sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

include/smb.h: Re-added zero pointer protection to ZERO_STRUCTP.

Browse Source 
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)
This commit is contained in:
Jeremy Allison 1998-11-13 02:07:07 +00:00
parent cb265dbb8b
commit 2164685b9f
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/include/smb.h
View File

@ -1655,9 +1655,7 @@ extern int unix_ERR_code;
#define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
/* zero a structure given a pointer to the structure */
#define ZERO_STRUCTP(x) { memset((char *)(x), 0, sizeof(*(x))); }
#define ZERO_STRUCTPN(x) { if (x != NULL) ZERO_STRUCTP(x); }
#define ZERO_STRUCTP(x) { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); }
/* zero an array - note that sizeof(array) must work - ie. it must not be a
pointer */

4
source3/lib/util_sock.c
View File

@ -795,7 +795,7 @@ char *client_name(int fd)
}
if (getpeername(fd, &sa, &length) < 0) {
DEBUG(0,("getpeername failed\n"));
DEBUG(0,("getpeername failed. Error was %s\n", strerror(errno) ));
return name_buf;
}
@ -840,7 +840,7 @@ char *client_addr(int fd)
}
if (getpeername(fd, &sa, &length) < 0) {
DEBUG(0,("getpeername failed\n"));
DEBUG(0,("getpeername failed. Error was %s\n", strerror(errno) ));
return addr_buf;
}

12
source3/rpc_parse/parse_sec.c
View File

@ -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)
{

2
source3/smbd/quotas.c
View File

@ -373,7 +373,7 @@ BOOL disk_quotas(char *path, SMB_BIG_UINT *bsize, SMB_BIG_UINT *dfree, SMB_BIG_U
#include <ufs/quota.h>
/****************************************************************************
try to get the disk space from disk quotas - OFS1 version
try to get the disk space from disk quotas - OSF1 version
****************************************************************************/
BOOL disk_quotas(char *path, SMB_BIG_UINT *bsize, SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize)