summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-09-19 01:28:25 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:00:45 -0500
commitd52612a7d9336fff18d298aed7a7c9a756b9d31e (patch)
treec2daa7a166b5b898dcc1b1dda87deda89f8a3d35
parent6ef0edb38ee014394026d2d51af5dd82b694b2fb (diff)
downloadsamba-d52612a7d9336fff18d298aed7a7c9a756b9d31e.tar.gz
samba-d52612a7d9336fff18d298aed7a7c9a756b9d31e.tar.bz2
samba-d52612a7d9336fff18d298aed7a7c9a756b9d31e.zip
r18667: Two C++ warnings
(This used to be commit 8c60e71229cd577f3b17345c5824363dd202eba9)
-rw-r--r--source3/librpc/ndr/sid.c2
-rw-r--r--source3/nsswitch/pam_winbind.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/librpc/ndr/sid.c b/source3/librpc/ndr/sid.c
index af48063dfa..0a9ddb883b 100644
--- a/source3/librpc/ndr/sid.c
+++ b/source3/librpc/ndr/sid.c
@@ -73,7 +73,7 @@ char *dom_sid_string(TALLOC_CTX *mem_ctx, const struct dom_sid *sid)
}
maxlen = sid->num_auths * 11 + 25;
- ret = talloc_size(mem_ctx, maxlen);
+ ret = (char *)talloc_size(mem_ctx, maxlen);
if (!ret) return talloc_strdup(mem_ctx, "(SID ERR)");
ia = (sid->id_auth[5]) +
diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c
index eace97aa64..3bd90106ec 100644
--- a/source3/nsswitch/pam_winbind.c
+++ b/source3/nsswitch/pam_winbind.c
@@ -575,7 +575,7 @@ static int winbind_auth_request(pam_handle_t * pamh,
/* If winbindd returned a username, return the pointer to it here. */
if (user_ret && response.extra_data.data) {
/* We have to trust it's a null terminated string. */
- *user_ret = response.extra_data.data;
+ *user_ret = (char *)response.extra_data.data;
}
return ret;