s4: fix some build warnings.

Guenther

diff --git a/source4/ntvfs/ipc/rap_server.c b/source4/ntvfs/ipc/rap_server.c
index 825a17fd12b59e13a6b295d2c012693d99b5670b..b919cbcb200ba2fded8f13007824b1c0dbda4296 100644 (file)
--- a/source4/ntvfs/ipc/rap_server.c
+++ b/source4/ntvfs/ipc/rap_server.c
@@ -65,7 +65,7 @@ NTSTATUS rap_netshareenum(TALLOC_CTX *mem_ctx,
                        DEBUG(3, ("WARNING: Service [%s] disappeared after enumeration!\n", snames[i]));
                        continue;
                }
-               strncpy(r->out.info[j].info1.share_name,
+               strncpy((char *)r->out.info[j].info1.share_name,
                        snames[i],
                        sizeof(r->out.info[0].info1.share_name));
                r->out.info[i].info1.reserved1 = 0;

diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 158bf77e1babfd13980d41e026106d678d02f6b7..57d27ed32fbdaa28f6cbe3f1132677ef575c5dc9 100644 (file)
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -161,7 +161,7 @@ static void rap_cli_expect_format(struct rap_call *call, const char *format)
 }
 
 static NTSTATUS rap_pull_string(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr,
-                               uint16_t convert, char **dest)
+                               uint16_t convert, const char **dest)
 {
        uint16_t string_offset;
        uint16_t ignore;
@@ -183,7 +183,7 @@ static NTSTATUS rap_pull_string(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr,
                return NT_STATUS_INVALID_PARAMETER;
 
        *dest = talloc_zero_array(mem_ctx, char, len+1);
-       pull_string(*dest, p, len+1, len, STR_ASCII);
+       pull_string((char *)*dest, p, len+1, len, STR_ASCII);
 
        return NT_STATUS_OK;
 }

diff --git a/source4/torture/rap/rpc.c b/source4/torture/rap/rpc.c
index f245a919efacc72be7bf361fba16cd44931616cc..7696ed8e41ed5ddf4e681d8e6e972be1dd744684 100644 (file)
--- a/source4/torture/rap/rpc.c
+++ b/source4/torture/rap/rpc.c
@@ -65,7 +65,7 @@ static bool test_rpc_netservergetinfo(struct torture_context *tctx,
 
        server_name = talloc_strndup(tctx, info.info101->server_name, 16);
 
-       torture_assert_str_equal(tctx, r.out.info.info0.name, server_name, "server name");
+       torture_assert_str_equal(tctx, (const char *)r.out.info.info0.name, server_name, "server name");
 
        if (torture_setting_bool(tctx, "samba3", false)) {
                torture_skip(tctx, "skipping netservergetinfo level 1 against samba3");
@@ -79,7 +79,7 @@ static bool test_rpc_netservergetinfo(struct torture_context *tctx,
        torture_assert_int_equal(tctx, r.out.status, 0,
                "rap_netservergetinfo level 1 failed");
 
-       torture_assert_str_equal(tctx, r.out.info.info1.name, server_name, "server name");
+       torture_assert_str_equal(tctx, (const char *)r.out.info.info1.name, server_name, "server name");
        torture_assert_int_equal(tctx, r.out.info.info1.version_major, info.info101->version_major, "version major");
        torture_assert_int_equal(tctx, r.out.info.info1.version_minor, info.info101->version_minor, "version minor");
        torture_assert_int_equal(tctx, r.out.info.info1.servertype, info.info101->server_type, "server_type");