diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-07-30 16:36:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:25 -0500 |
| commit | e23781b3b304d1e69ad80af5ae9c0ed8d02cf996 (patch) | |
| tree | d3a6eb0774d9ce907152e886c4c920d24ac2d715 /source3/modules | |
| parent | 5a5deade6e4634aad561139f39337c9a960c0b80 (diff) | |
| download | samba-e23781b3b304d1e69ad80af5ae9c0ed8d02cf996.tar.gz samba-e23781b3b304d1e69ad80af5ae9c0ed8d02cf996.tar.bz2 samba-e23781b3b304d1e69ad80af5ae9c0ed8d02cf996.zip | |
r17316: More C++ warnings -- 456 left
(This used to be commit 1e4ee728df7eeafc1b4d533240acb032f73b4f5c)
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_posixacl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/modules/vfs_posixacl.c b/source3/modules/vfs_posixacl.c index 6d7c2b3c00..c793d83068 100644 --- a/source3/modules/vfs_posixacl.c +++ b/source3/modules/vfs_posixacl.c @@ -172,7 +172,7 @@ static BOOL smb_ace_to_internal(acl_entry_t posix_ace, } switch(ace->a_type) { case SMB_ACL_USER: { - uid_t *puid = acl_get_qualifier(posix_ace); + uid_t *puid = (uid_t *)acl_get_qualifier(posix_ace); if (puid == NULL) { DEBUG(0, ("smb_acl_get_qualifier failed\n")); return False; @@ -183,7 +183,7 @@ static BOOL smb_ace_to_internal(acl_entry_t posix_ace, } case SMB_ACL_GROUP: { - gid_t *pgid = acl_get_qualifier(posix_ace); + gid_t *pgid = (uid_t *)acl_get_qualifier(posix_ace); if (pgid == NULL) { DEBUG(0, ("smb_acl_get_qualifier failed\n")); return False; @@ -219,9 +219,9 @@ static struct smb_acl_t *smb_acl_to_internal(acl_t acl) entry_id = ACL_NEXT_ENTRY; - result = SMB_REALLOC(result, sizeof(struct smb_acl_t) + - (sizeof(struct smb_acl_entry) * - (result->count+1))); + result = (struct smb_acl_t *)SMB_REALLOC( + result, sizeof(struct smb_acl_t) + + (sizeof(struct smb_acl_entry) * (result->count+1))); if (result == NULL) { DEBUG(0, ("SMB_REALLOC failed\n")); errno = ENOMEM; |