r17345: Some C++ warnings

(This used to be commit 21c8fa2fc8bfd35d203b089ff61efc7c292b4dc0)

diff --git a/source3/intl/lang_tdb.c b/source3/intl/lang_tdb.c
index 016f64af52ad50772ccb75b7014804add60b31b1..ddb3d4d65e3e4202d5cd9eae21e790a6ffceed29 100644 (file)
--- a/source3/intl/lang_tdb.c
+++ b/source3/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/source3/libads/kerberos.c b/source3/libads/kerberos.c
index af4ba8683137f723ea27793bec68c1f20de7c76b..910207968c8e35b46a5b6b6d32b247774139cc96 100644 (file)
--- a/source3/libads/kerberos.c
+++ b/source3/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/source3/nsswitch/wb_client.c b/source3/nsswitch/wb_client.c
index b1a7947137560506f9395b1ddb478c586c2969e6..2f0a694d6822186c9a92d009f2b7302800eb2178 100644 (file)
--- a/source3/nsswitch/wb_client.c
+++ b/source3/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/source3/nsswitch/wb_common.c b/source3/nsswitch/wb_common.c
index 91ebdbd58446e6b90937609af83254fa19d16fb3..e665a0ffd525c08fb6f1bc4833301b1591ab0b6d 100644 (file)
--- a/source3/nsswitch/wb_common.c
+++ b/source3/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;
                }