mirror of
https://github.com/samba-team/samba.git
synced 2025-01-13 13:18:06 +03:00
make the echo idl match the win32 IDL again
(This used to be commit 4b901bd717
)
This commit is contained in:
parent
f01e89e9e0
commit
8a8b2da9c9
@ -80,7 +80,7 @@ interface rpcecho
|
||||
} echo_Info;
|
||||
|
||||
NTSTATUS TestCall2 (
|
||||
[in] uint32 level,
|
||||
[in] uint16 level,
|
||||
[out,switch_is(level)] echo_Info *info
|
||||
);
|
||||
}
|
||||
|
@ -50,7 +50,7 @@ NTSTATUS ndr_push_TestCall(struct ndr_push *ndr, struct TestCall *r)
|
||||
|
||||
NTSTATUS ndr_push_TestCall2(struct ndr_push *ndr, struct TestCall2 *r)
|
||||
{
|
||||
NDR_CHECK(ndr_push_uint32(ndr, r->in.level));
|
||||
NDR_CHECK(ndr_push_uint16(ndr, r->in.level));
|
||||
|
||||
return NT_STATUS_OK;
|
||||
}
|
||||
@ -299,8 +299,8 @@ NTSTATUS ndr_pull_TestCall2(struct ndr_pull *ndr, struct TestCall2 *r)
|
||||
}
|
||||
if (r->out.info) {
|
||||
if ((NDR_SCALARS|NDR_BUFFERS) & NDR_SCALARS) {
|
||||
uint32 _level;
|
||||
NDR_CHECK(ndr_pull_uint32(ndr, &_level));
|
||||
uint16 _level;
|
||||
NDR_CHECK(ndr_pull_uint16(ndr, &_level));
|
||||
if (_level != r->in.level) return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u in info");
|
||||
}
|
||||
NDR_CHECK(ndr_pull_echo_Info(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.level, r->out.info));
|
||||
@ -550,7 +550,7 @@ void ndr_print_TestCall2(struct ndr_print *ndr, const char *name, int flags, str
|
||||
if (flags & NDR_IN) {
|
||||
ndr_print_struct(ndr, "in", "TestCall2");
|
||||
ndr->depth++;
|
||||
ndr_print_uint32(ndr, "level", r->in.level);
|
||||
ndr_print_uint16(ndr, "level", r->in.level);
|
||||
ndr->depth--;
|
||||
}
|
||||
if (flags & NDR_OUT) {
|
||||
|
@ -115,7 +115,7 @@ union echo_Info {
|
||||
|
||||
struct TestCall2 {
|
||||
struct {
|
||||
uint32 level;
|
||||
uint16 level;
|
||||
} in;
|
||||
|
||||
struct {
|
||||
|
@ -224,7 +224,7 @@ BOOL torture_rpc_echo(int dummy)
|
||||
return False;
|
||||
}
|
||||
|
||||
#if 0
|
||||
#if 1
|
||||
if (!test_addone(p, mem_ctx)) {
|
||||
ret = False;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user