summaryrefslogtreecommitdiff
path: root/source3/nsswitch/winbindd_pam.c
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-08-18 14:05:25 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:42 -0500
commit0b56ff1ea3bab9f5aebf43e3dfc4847b3f912553 (patch)
tree188f46328aa6f39329c2b4b64ee3742cb0ab6432 /source3/nsswitch/winbindd_pam.c
parentf3828606bd7b826dbbb8a56b61750914ea10ecc5 (diff)
downloadsamba-0b56ff1ea3bab9f5aebf43e3dfc4847b3f912553.tar.gz
samba-0b56ff1ea3bab9f5aebf43e3dfc4847b3f912553.tar.bz2
samba-0b56ff1ea3bab9f5aebf43e3dfc4847b3f912553.zip
r17605: Some C++ warnings
(This used to be commit 05268d7a731861b10ce8556fd32a004808383923)
Diffstat (limited to 'source3/nsswitch/winbindd_pam.c')
-rw-r--r--source3/nsswitch/winbindd_pam.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c
index 6af8e31bc0..66d297090b 100644
--- a/source3/nsswitch/winbindd_pam.c
+++ b/source3/nsswitch/winbindd_pam.c
@@ -104,7 +104,7 @@ static NTSTATUS append_info3_as_ndr(TALLOC_CTX *mem_ctx,
return NT_STATUS_NO_MEMORY;
}
memset( state->response.extra_data.data, '\0', size );
- prs_copy_all_data_out(state->response.extra_data.data, &ps);
+ prs_copy_all_data_out((char *)state->response.extra_data.data, &ps);
state->response.length += size;
prs_mem_free(&ps);
return NT_STATUS_OK;
@@ -1370,9 +1370,10 @@ done:
state->response.extra_data.data =
afs_createtoken_str(afsname, cell);
- if (state->response.extra_data.data != NULL)
+ if (state->response.extra_data.data != NULL) {
state->response.length +=
- strlen(state->response.extra_data.data)+1;
+ strlen((const char *)state->response.extra_data.data)+1;
+ }
no_token:
TALLOC_FREE(afsname);
@@ -1622,7 +1623,8 @@ enum winbindd_result winbindd_dual_pam_auth_crap(struct winbindd_domain *domain,
result = NT_STATUS_NO_MEMORY;
goto done;
}
- state->response.length += strlen(state->response.extra_data.data)+1;
+ state->response.length +=
+ strlen((const char *)state->response.extra_data.data)+1;
}
if (state->request.flags & WBFLAG_PAM_USER_SESSION_KEY) {