diff options
| author | Andrew Tridgell <tridge@samba.org> | 2003-11-20 01:32:43 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2003-11-20 01:32:43 +0000 |
| commit | 8a8b2da9c9bb405d24f29684ebda4b9950f4e89f (patch) | |
| tree | 5186240ecdfa90a186261784cd206459930d675f | |
| parent | f01e89e9e0800df912b5ee87bcacb664daa0895e (diff) | |
| download | samba-8a8b2da9c9bb405d24f29684ebda4b9950f4e89f.tar.gz samba-8a8b2da9c9bb405d24f29684ebda4b9950f4e89f.tar.bz2 samba-8a8b2da9c9bb405d24f29684ebda4b9950f4e89f.zip | |
make the echo idl match the win32 IDL again
(This used to be commit 4b901bd717a48daae24d8f7738169ac3cc5ba7fa)
| -rw-r--r-- | source4/librpc/idl/echo.idl | 2 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr_echo.c | 8 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr_echo.h | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/echo.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source4/librpc/idl/echo.idl b/source4/librpc/idl/echo.idl index 304ba4c66a..38650e990d 100644 --- a/source4/librpc/idl/echo.idl +++ b/source4/librpc/idl/echo.idl @@ -80,7 +80,7 @@ interface rpcecho } echo_Info; NTSTATUS TestCall2 ( - [in] uint32 level, + [in] uint16 level, [out,switch_is(level)] echo_Info *info ); } diff --git a/source4/librpc/ndr/ndr_echo.c b/source4/librpc/ndr/ndr_echo.c index 3c548d9be8..b3ec408b2d 100644 --- a/source4/librpc/ndr/ndr_echo.c +++ b/source4/librpc/ndr/ndr_echo.c @@ -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) { diff --git a/source4/librpc/ndr/ndr_echo.h b/source4/librpc/ndr/ndr_echo.h index c7c371ebca..1e33a48516 100644 --- a/source4/librpc/ndr/ndr_echo.h +++ b/source4/librpc/ndr/ndr_echo.h @@ -115,7 +115,7 @@ union echo_Info { struct TestCall2 { struct { - uint32 level; + uint16 level; } in; struct { diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c index 2ea7362e9a..8d8a3d7c0c 100644 --- a/source4/torture/rpc/echo.c +++ b/source4/torture/rpc/echo.c @@ -224,7 +224,7 @@ BOOL torture_rpc_echo(int dummy) return False; } -#if 0 +#if 1 if (!test_addone(p, mem_ctx)) { ret = False; } |