From 21c8fa2fc8bfd35d203b089ff61efc7c292b4dc0 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 31 Jul 2006 20:51:55 +0000
Subject: [PATCH] r17345: Some C++ warnings

---
 source/intl/lang_tdb.c      | 2 +-
 source/libads/kerberos.c    | 3 ++-
 source/nsswitch/wb_client.c | 2 +-
 source/nsswitch/wb_common.c | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/source/intl/lang_tdb.c b/source/intl/lang_tdb.c
index 016f64af52..ddb3d4d65e 100644
--- a/source/intl/lang_tdb.c
+++ b/source/intl/lang_tdb.c
@@ -197,7 +197,7 @@ const char *lang_msg(const char *msgid)
 			count++;
 	}
 
-	if (!(msgid_quoted = SMB_MALLOC(strlen(msgid) + count + 1)))
+	if (!(msgid_quoted = (char *)SMB_MALLOC(strlen(msgid) + count + 1)))
 		return msgid;
 
 	/* string_sub() is unsuitable here as it replaces some punctuation
diff --git a/source/libads/kerberos.c b/source/libads/kerberos.c
index af4ba86831..910207968c 100644
--- a/source/libads/kerberos.c
+++ b/source/libads/kerberos.c
@@ -45,7 +45,8 @@ 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;
diff --git a/source/nsswitch/wb_client.c b/source/nsswitch/wb_client.c
index b1a7947137..2f0a694d68 100644
--- a/source/nsswitch/wb_client.c
+++ b/source/nsswitch/wb_client.c
@@ -172,7 +172,7 @@ BOOL winbind_lookup_rids(TALLOC_CTX *mem_ctx,
 		goto fail;
 	}
 
-	p = response.extra_data.data;
+	p = (char *)response.extra_data.data;
 
 	for (i=0; i<num_rids; i++) {
 		char *q;
diff --git a/source/nsswitch/wb_common.c b/source/nsswitch/wb_common.c
index 91ebdbd584..e665a0ffd5 100644
--- a/source/nsswitch/wb_common.c
+++ b/source/nsswitch/wb_common.c
@@ -324,7 +324,7 @@ static int winbind_open_pipe_sock(int recursing)
 	request.flags = WBFLAG_RECURSE;
 	if (winbindd_request_response(WINBINDD_PRIV_PIPE_DIR, &request, &response) == NSS_STATUS_SUCCESS) {
 		int fd;
-		if ((fd = winbind_named_pipe_sock(response.extra_data.data)) != -1) {
+		if ((fd = winbind_named_pipe_sock((char *)response.extra_data.data)) != -1) {
 			close(winbindd_fd);
 			winbindd_fd = fd;
 		}
-- 
2.34.1