From 67ca76c288eb095ae59e98927317d51c96c89551 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 29 Apr 2009 01:55:09 +0200 Subject: samr: fix samr_ConnectVersion enum which is 32bit not 16bit. Volker, please check. Rafal, haven't we seen this in your tests at sambaxp as well ? Guenther --- librpc/gen_ndr/ndr_samr.c | 6 +++--- librpc/idl/samr.idl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/librpc/gen_ndr/ndr_samr.c b/librpc/gen_ndr/ndr_samr.c index d2d345a66a..ab76f5af28 100644 --- a/librpc/gen_ndr/ndr_samr.c +++ b/librpc/gen_ndr/ndr_samr.c @@ -4508,14 +4508,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/librpc/idl/samr.idl b/librpc/idl/samr.idl index 06bdf180ac..17d8135d8d 100644 --- a/librpc/idl/samr.idl +++ b/librpc/idl/samr.idl @@ -1387,7 +1387,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 -- cgit