make the echo idl match the win32 IDL again

(This used to be commit 4b901bd717a48daae24d8f7738169ac3cc5ba7fa)

diff --git a/source4/librpc/idl/echo.idl b/source4/librpc/idl/echo.idl
index 304ba4c66a828c5cd42f60adf3dee86072b80dbc..38650e990de1767c7ce079d00d420bfb0e981276 100644 (file)
--- 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 3c548d9be884c464bd9978f419dfd2162ac27518..b3ec408b2d5bd845f46a8738bced81341b721ab8 100644 (file)
--- 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 c7c371ebca078eb1c52071c17634f4a2ab82bb4d..1e33a48516c05b9a8ba411e9765578a512abc13c 100644 (file)
--- 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 2ea7362e9adcd8fc27e22bd58941443ca1fdcc01..8d8a3d7c0c697727c1cc4ec656d5d058c132d5d4 100644 (file)
--- 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;
        }