[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5242-g151042f

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  151042f5b348c6eb7bcc702193fb046305630116 (commit)
      from  226620d0ed221da983b4f662fcef14906588f1bd (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 151042f5b348c6eb7bcc702193fb046305630116
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 29 01:55:09 2009 +0200

    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 at samba.org>

-----------------------------------------------------------------------

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 c82078f..ae3605b 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 9e933a5..4a36ae1 100644
--- 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


-- 
Samba Shared Repository