The branch, v3-2-test has been updated
via 0b0b0499f0ba60cfff943fa2200a6534c0a3f816 (commit)
from 07835177469d7699a478014f7a4a556684705bb6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 0b0b0499f0ba60cfff943fa2200a6534c0a3f816
Author: Günther Deschner <[email protected]>
Date: Wed Apr 29 01:55:09 2009 +0200
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 <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source/librpc/gen_ndr/ndr_samr.c | 6 +++---
source/librpc/idl/samr.idl | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c
index bd87a50..62676d2 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 b8337fd..f9b3a69 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
--
Samba Shared Repository
