diff options
| author | Günther Deschner <gd@samba.org> | 2009-04-29 01:55:09 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-05-04 13:54:01 +0200 |
| commit | 0b0b0499f0ba60cfff943fa2200a6534c0a3f816 (patch) | |
| tree | 5b8334d55e350174d132562866bfee4a19cae083 | |
| parent | 07835177469d7699a478014f7a4a556684705bb6 (diff) | |
| download | samba-0b0b0499f0ba60cfff943fa2200a6534c0a3f816.tar.gz samba-0b0b0499f0ba60cfff943fa2200a6534c0a3f816.tar.xz samba-0b0b0499f0ba60cfff943fa2200a6534c0a3f816.zip | |
3.2 samr bug 6301: fix samr_ConnectVersion enum which is 32bit not 16bit.
Port of 67ca76c288eb095ae to 3.2
Signed-off-by: Volker Lendecke <vl@samba.org>
| -rw-r--r-- | source/librpc/gen_ndr/ndr_samr.c | 6 | ||||
| -rw-r--r-- | source/librpc/idl/samr.idl | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c index bd87a50a534..62676d2216e 100644 --- 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 b8337fddb7b..f9b3a6920a0 100644 --- a/source/librpc/idl/samr.idl +++ b/source/librpc/idl/samr.idl @@ -1246,7 +1246,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 |