summaryrefslogtreecommitdiff
path: root/source3/libads
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-08-20 17:55:06 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:44 -0500
commitf852fdbe06ec9f19424d6870cba9b1872a0d5d7a (patch)
tree8c222bbb5d9f076da71458ba1d43b2b33ce474a6 /source3/libads
parentf8825406fb43b514f9fb031a1ff5ec9280c67ada (diff)
downloadsamba-f852fdbe06ec9f19424d6870cba9b1872a0d5d7a.tar.gz
samba-f852fdbe06ec9f19424d6870cba9b1872a0d5d7a.tar.bz2
samba-f852fdbe06ec9f19424d6870cba9b1872a0d5d7a.zip
r17626: Some C++ Warnings
(This used to be commit 09e7c010f03ac3c621f7a7fad44685d278c1481a)
Diffstat (limited to 'source3/libads')
-rw-r--r--source3/libads/ads_struct.c2
-rw-r--r--source3/libads/krb5_setpw.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/source3/libads/ads_struct.c b/source3/libads/ads_struct.c
index 7a03a2a80f..372f72fe06 100644
--- a/source3/libads/ads_struct.c
+++ b/source3/libads/ads_struct.c
@@ -42,7 +42,7 @@ char *ads_build_path(const char *realm, const char *sep, const char *field, int
len = (numbits+1)*(strlen(field)+1) + strlen(r) + 1;
- ret = SMB_MALLOC(len);
+ ret = (char *)SMB_MALLOC(len);
if (!ret)
return NULL;
diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
index 07e6320c26..c7a4b982db 100644
--- a/source3/libads/krb5_setpw.c
+++ b/source3/libads/krb5_setpw.c
@@ -667,7 +667,9 @@ kerb_prompter(krb5_context ctx, void *data,
memset(prompts[0].reply->data, 0, prompts[0].reply->length);
if (prompts[0].reply->length > 0) {
if (data) {
- strncpy(prompts[0].reply->data, data, prompts[0].reply->length-1);
+ strncpy(prompts[0].reply->data,
+ (const char *)data,
+ prompts[0].reply->length-1);
prompts[0].reply->length = strlen(prompts[0].reply->data);
} else {
prompts[0].reply->length = 0;