diff options
| author | Günther Deschner <gd@samba.org> | 2009-04-29 01:55:09 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-04-29 13:00:53 +0200 |
| commit | 1d1786bdb58569ea710740f45aca61119ecfa8ae (patch) | |
| tree | caa8283ef5ce6239f2fa887ea71f84ad0b281a27 | |
| parent | 49fdd2055ca6f68fd32f69e5dd3ee3ce047cc2cb (diff) | |
| download | samba-1d1786bdb58569ea710740f45aca61119ecfa8ae.tar.gz | |
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
(cherry picked from commit 67ca76c288eb095ae59e98927317d51c96c89551)
(cherry picked from commit 59e75824e81ffb6d05e624a5344123c585998904)
| -rw-r--r-- | librpc/gen_ndr/ndr_samr.c | 6 | ||||
| -rw-r--r-- | 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 d2d345a66a3..ab76f5af281 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 bcd8ca066cd..fcfa8faccca 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 |