mirror of
https://github.com/samba-team/samba.git
synced 2025-03-27 22:50:26 +03:00
s4: fix some build warnings.
Guenther
This commit is contained in:
parent
dbfff90185
commit
aae716d044
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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");
|
||||
|
Loading…
x
Reference in New Issue
Block a user