[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-461-g2e9bd2b

[Günther Deschner]

The branch, v3-4-test has been updated
       via  2e9bd2ba8fa9ddf7324b1d9546c3112614b88f27 (commit)
       via  da934c1917833c2b3cf6154f069d6012c6d7c07b (commit)
      from  e1041f5957e84b6c255c714b2bf6056cdc8f3323 (commit)

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


- Log -----------------------------------------------------------------
commit 2e9bd2ba8fa9ddf7324b1d9546c3112614b88f27
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 18 01:07:49 2009 +0100

    s3: re-run make samba3-idl.
    
    Guenther
    (cherry picked from commit 2dae07a3ca62670d384937df2e4e9d6f54c99619)

commit da934c1917833c2b3cf6154f069d6012c6d7c07b
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 18 00:36:54 2009 +0100

    spoolss: fix spoolss_PrinterEnumValues w.r.t. size calculation of PrinterData.
    
    Guenther
    (cherry picked from commit 4fb79b4fe78e89b7bbee5b280294037f43e0e2a1)

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

Summary of changes:
 librpc/gen_ndr/ndr_spoolss.c |    4 ++--
 librpc/gen_ndr/spoolss.h     |    2 +-
 librpc/idl/spoolss.idl       |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index ba80b0e..f9781bc 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -18263,10 +18263,10 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterEnumValues(struct ndr_push *n
 			NDR_CHECK(ndr_push_relative_ptr2(ndr, r->data));
 			{
 				struct ndr_push *_ndr_data;
-				NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_data, 0, ndr_size_spoolss_PrinterData(r->data, r->type, ndr->iconv_convenience, ndr->flags)));
+				NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_data, 0, r->data_length));
 				NDR_CHECK(ndr_push_set_switch_value(_ndr_data, r->data, r->type));
 				NDR_CHECK(ndr_push_spoolss_PrinterData(_ndr_data, NDR_SCALARS|NDR_BUFFERS, r->data));
-				NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_data, 0, ndr_size_spoolss_PrinterData(r->data, r->type, ndr->iconv_convenience, ndr->flags)));
+				NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_data, 0, r->data_length));
 			}
 		}
 	}
diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index 2c6e9a6..c703c87 100644
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -1483,7 +1483,7 @@ struct spoolss_PrinterEnumValues {
 	const char * value_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
 	uint32_t value_name_len;/* [value(2*strlen_m_term(value_name))] */
 	enum winreg_Type type;
-	union spoolss_PrinterData *data;/* [relative,subcontext_size(data_length),subcontext(0),switch_is(type)] */
+	union spoolss_PrinterData *data;/* [relative,subcontext_size(r->data_length),subcontext(0),switch_is(type)] */
 	uint32_t data_length;/* [value(ndr_size_spoolss_PrinterData(data,type,ndr->iconv_convenience,ndr->flags))] */
 }/* [relative_base,gensize,public] */;
 
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index fc87814..59d90ec 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -2223,7 +2223,7 @@ import "misc.idl", "security.idl", "winreg.idl";
 		[relative] nstring *value_name;
 		[value(2*strlen_m_term(value_name))] uint32 value_name_len;
 		winreg_Type type;
-		[relative,switch_is(type),subcontext(0),subcontext_size(data_length)] spoolss_PrinterData *data;
+		[relative,switch_is(type),subcontext(0),subcontext_size(r->data_length)] spoolss_PrinterData *data;
 		[value(ndr_size_spoolss_PrinterData(data, type, ndr->iconv_convenience, ndr->flags))] uint32 data_length;
 	} spoolss_PrinterEnumValues;
 


-- 
Samba Shared Repository