3.3 samr bug 6301: fix samr_ConnectVersion enum which is 32bit not 16bit.

Port of 67ca76c288eb095ae to 3.3

Signed-off-by: Volker Lendecke <vl@samba.org>

diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c
index c82078fafc500f25038d70a69c58bb46d8532bf1..ae3605bceba625a1b1c30bc357b0c3f99c2ae9ee 100644 (file)
--- a/source/librpc/gen_ndr/ndr_samr.c
+++ b/source/librpc/gen_ndr/ndr_samr.c
@@ -4430,14 +4430,14 @@ _PUBLIC_ void ndr_print_samr_PwInfo(struct ndr_print *ndr, const char *name, con
 
 static enum ndr_err_code ndr_push_samr_ConnectVersion(struct ndr_push *ndr, int ndr_flags, enum samr_ConnectVersion r)
 {
-       NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r));
+       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
 static enum ndr_err_code ndr_pull_samr_ConnectVersion(struct ndr_pull *ndr, int ndr_flags, enum samr_ConnectVersion *r)
 {
-       uint16_t v;
-       NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &v));
+       uint32_t v;
+       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
        *r = v;
        return NDR_ERR_SUCCESS;
 }

diff --git a/source/librpc/idl/samr.idl b/source/librpc/idl/samr.idl
index 9e933a59103be5a52e9aa2e7170a394513c1f7f9..4a36ae1621e94e2e97cfff6406ec23a6917cbadb 100644 (file)
--- a/source/librpc/idl/samr.idl
+++ b/source/librpc/idl/samr.idl
@@ -1370,7 +1370,7 @@ import "misc.idl", "lsa.idl", "security.idl";
        /************************/
        /* Function    0x3e     */
 
-       typedef enum {
+       typedef [v1_enum] enum {
                SAMR_CONNECT_PRE_W2K    = 1,
                SAMR_CONNECT_W2K        = 2,
                SAMR_CONNECT_AFTER_W2K  = 3