diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-07-31 21:40:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:27 -0500 |
| commit | 430fa0eba08cbf180d83740a895a0018af1c7f21 (patch) | |
| tree | 0f51b6635f456a800a7fe609f30fdbd537460ee8 /source3/smbd/posix_acls.c | |
| parent | e7952e9c14218d0c8c13973056ab8762876e5a79 (diff) | |
| download | samba-430fa0eba08cbf180d83740a895a0018af1c7f21.tar.gz samba-430fa0eba08cbf180d83740a895a0018af1c7f21.tar.bz2 samba-430fa0eba08cbf180d83740a895a0018af1c7f21.zip | |
r17348: Some C++ warnings
(This used to be commit ae6b9b34e59167e3958bfdb9997fa25340b9a0a3)
Diffstat (limited to 'source3/smbd/posix_acls.c')
| -rw-r--r-- | source3/smbd/posix_acls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 3ea442f818..a431f6e07a 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -169,7 +169,7 @@ static char *create_pai_buf(canon_ace *file_ace_list, canon_ace *dir_ace_list, B *store_size = PAI_ENTRIES_BASE + ((num_entries + num_def_entries)*PAI_ENTRY_LENGTH); - pai_buf = SMB_MALLOC(*store_size); + pai_buf = (char *)SMB_MALLOC(*store_size); if (!pai_buf) { return NULL; } @@ -441,7 +441,7 @@ static struct pai_val *load_inherited_info(files_struct *fsp) if (!lp_map_acl_inherit(SNUM(fsp->conn))) return NULL; - if ((pai_buf = SMB_MALLOC(pai_buf_size)) == NULL) + if ((pai_buf = (char *)SMB_MALLOC(pai_buf_size)) == NULL) return NULL; do { @@ -462,7 +462,7 @@ static struct pai_val *load_inherited_info(files_struct *fsp) if (pai_buf_size > 1024*1024) { return NULL; /* Limit malloc to 1mb. */ } - if ((pai_buf = SMB_MALLOC(pai_buf_size)) == NULL) + if ((pai_buf = (char *)SMB_MALLOC(pai_buf_size)) == NULL) return NULL; } } while (ret == -1); |