summaryrefslogtreecommitdiff
path: root/source3/nsswitch
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-08-01 12:45:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:28 -0500
commit467ec2a32bac08468855a5a28a7d6e25b26904d5 (patch)
treebc04c0e4a90ad694699d78cfbac7b6671813aade /source3/nsswitch
parentfbd04d65c56c36bec287f6c4ffe84ea79b048fa7 (diff)
downloadsamba-467ec2a32bac08468855a5a28a7d6e25b26904d5.tar.gz
samba-467ec2a32bac08468855a5a28a7d6e25b26904d5.tar.bz2
samba-467ec2a32bac08468855a5a28a7d6e25b26904d5.zip
r17363: Some C++ warnings
(This used to be commit fd82f185a2e0f94bfb75f4eee072556ad94bf27d)
Diffstat (limited to 'source3/nsswitch')
-rw-r--r--source3/nsswitch/winbind_nss_linux.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/source3/nsswitch/winbind_nss_linux.c b/source3/nsswitch/winbind_nss_linux.c
index 78a39f2873..6efb9041f9 100644
--- a/source3/nsswitch/winbind_nss_linux.c
+++ b/source3/nsswitch/winbind_nss_linux.c
@@ -370,7 +370,8 @@ _nss_winbind_getpwent_r(struct passwd *result, char *buffer,
return_result:
- pw_cache = getpwent_response.extra_data.data;
+ pw_cache = (struct winbindd_pw *)
+ getpwent_response.extra_data.data;
/* Check data is valid */
@@ -613,7 +614,8 @@ winbind_getgrent(enum winbindd_cmd cmd,
return_result:
- gr_cache = getgrent_response.extra_data.data;
+ gr_cache = (struct winbindd_gr *)
+ getgrent_response.extra_data.data;
/* Check data is valid */
@@ -704,7 +706,7 @@ _nss_winbind_getgrnam_r(const char *name,
if (ret == NSS_STATUS_SUCCESS) {
ret = fill_grent(result, &response.data.gr,
- response.extra_data.data,
+ (char *)response.extra_data.data,
&buffer, &buflen);
if (ret == NSS_STATUS_TRYAGAIN) {
@@ -719,7 +721,8 @@ _nss_winbind_getgrnam_r(const char *name,
/* We've been called again */
ret = fill_grent(result, &response.data.gr,
- response.extra_data.data, &buffer, &buflen);
+ (char *)response.extra_data.data, &buffer,
+ &buflen);
if (ret == NSS_STATUS_TRYAGAIN) {
keep_response = True;
@@ -767,7 +770,7 @@ _nss_winbind_getgrgid_r(gid_t gid,
if (ret == NSS_STATUS_SUCCESS) {
ret = fill_grent(result, &response.data.gr,
- response.extra_data.data,
+ (char *)response.extra_data.data,
&buffer, &buflen);
if (ret == NSS_STATUS_TRYAGAIN) {
@@ -782,7 +785,8 @@ _nss_winbind_getgrgid_r(gid_t gid,
/* We've been called again */
ret = fill_grent(result, &response.data.gr,
- response.extra_data.data, &buffer, &buflen);
+ (char *)response.extra_data.data, &buffer,
+ &buflen);
if (ret == NSS_STATUS_TRYAGAIN) {
keep_response = True;
@@ -853,7 +857,9 @@ _nss_winbind_initgroups_dyn(char *user, gid_t group, long int *start,
}
}
- newgroups = realloc((*groups), newsize * sizeof(**groups));
+ newgroups = (gid_t *)
+ realloc((*groups),
+ newsize * sizeof(**groups));
if (!newgroups) {
*errnop = ENOMEM;
ret = NSS_STATUS_NOTFOUND;