svn commit: samba r21655 - in branches/SAMBA_3_0: . source/librpc/gen_ndr

[jelmer at samba.org]

Author: jelmer
Date: 2007-03-02 14:26:19 +0000 (Fri, 02 Mar 2007)
New Revision: 21655

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21655

Log:
Regenerate after pidl bugfix.
Modified:
   branches/SAMBA_3_0/
   branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_initshutdown.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_lsa.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_netlogon.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_winreg.c


Changeset:

Property changes on: branches/SAMBA_3_0
___________________________________________________________________
Name: bzr:merge
   - jelmer at samba.org-20060718161613-53e1c111cabecd57
jelmer at samba.org-20060729112811-c224341dc6387f22
jelmer at samba.org-20060824202535-0923b9ac63b0de61
jelmer at samba.org-20060824205058-95b956f158533304
jelmer at samba.org-20060824220658-230fbfb53bdad5e7
jelmer at samba.org-20060824220942-b7a63fab1a82825e
jelmer at samba.org-20060824232016-69881278506065b0
jelmer at samba.org-20060825031555-18b374fbcabd3b04
jelmer at samba.org-20060906183058-bd444ea54d961569
jelmer at samba.org-20070116153619-w9vubayci8fujmes
jelmer at samba.org-20070116174619-tx8yabv4p50jlqp2
jelmer at samba.org-20070116182350-dq986bj4yj3m4s12
jelmer at samba.org-20070118101400-trvls9ul7o9f0j7y
jelmer at samba.org-20070206225320-l6zta3y928rbh5bk
jelmer at samba.org-20070216144754-yuizh6f7xn03o4n7
jelmer at samba.org-20070216153310-1104i8xz3sl68pup
jelmer at samba.org-20070220134145-znvxi315xp1ahxd3
jelmer at samba.org-20070227171447-yh04c17p154kpzlk
jelmer at samba.org-20070227185035-nmhiey8cbairzzxg
jelmer at samba.org-20070302125048-0yjfn5jayr9s8y9o
jelmer at samba.org-20070302130827-754aeb2xmusvee51

   + jelmer at samba.org-20060718161613-53e1c111cabecd57
jelmer at samba.org-20060729112811-c224341dc6387f22
jelmer at samba.org-20060824202535-0923b9ac63b0de61
jelmer at samba.org-20060824205058-95b956f158533304
jelmer at samba.org-20060824220658-230fbfb53bdad5e7
jelmer at samba.org-20060824220942-b7a63fab1a82825e
jelmer at samba.org-20060824232016-69881278506065b0
jelmer at samba.org-20060825031555-18b374fbcabd3b04
jelmer at samba.org-20060906183058-bd444ea54d961569
jelmer at samba.org-20070116153619-w9vubayci8fujmes
jelmer at samba.org-20070116174619-tx8yabv4p50jlqp2
jelmer at samba.org-20070116182350-dq986bj4yj3m4s12
jelmer at samba.org-20070118101400-trvls9ul7o9f0j7y
jelmer at samba.org-20070206225320-l6zta3y928rbh5bk
jelmer at samba.org-20070216144754-yuizh6f7xn03o4n7
jelmer at samba.org-20070216153310-1104i8xz3sl68pup
jelmer at samba.org-20070220134145-znvxi315xp1ahxd3
jelmer at samba.org-20070227171447-yh04c17p154kpzlk
jelmer at samba.org-20070227185035-nmhiey8cbairzzxg
jelmer at samba.org-20070302125048-0yjfn5jayr9s8y9o
jelmer at samba.org-20070302130827-754aeb2xmusvee51
jelmer at samba.org-20070302142434-z9yri1i7zdaxmjvs


Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_initshutdown.c
===================================================================
--- branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_initshutdown.c	2007-03-02 14:05:52 UTC (rev 21654)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_initshutdown.c	2007-03-02 14:26:19 UTC (rev 21655)
@@ -41,7 +41,7 @@
 {
 	ndr_print_struct(ndr, name, "initshutdown_String_sub");
 	ndr->depth++;
-	ndr_print_uint32(ndr, "name_size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m_term(r->name):strlen_m_term(r->name));
+	ndr_print_uint32(ndr, "name_size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m_term(r->name):r->name_size);
 	ndr_print_string(ndr, "name", r->name);
 	ndr->depth--;
 }
@@ -92,8 +92,8 @@
 {
 	ndr_print_struct(ndr, name, "initshutdown_String");
 	ndr->depth++;
-	ndr_print_uint16(ndr, "name_len", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m(r->name->name) * 2:strlen_m(r->name->name) * 2);
-	ndr_print_uint16(ndr, "name_size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m_term(r->name->name) * 2:strlen_m_term(r->name->name) * 2);
+	ndr_print_uint16(ndr, "name_len", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m(r->name->name) * 2:r->name_len);
+	ndr_print_uint16(ndr, "name_size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m_term(r->name->name) * 2:r->name_size);
 	ndr_print_ptr(ndr, "name", r->name);
 	ndr->depth++;
 	if (r->name) {

Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_lsa.c
===================================================================
--- branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_lsa.c	2007-03-02 14:05:52 UTC (rev 21654)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_lsa.c	2007-03-02 14:26:19 UTC (rev 21655)
@@ -64,8 +64,8 @@
 {
 	ndr_print_struct(ndr, name, "lsa_String");
 	ndr->depth++;
-	ndr_print_uint16(ndr, "length", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?2 * strlen_m(r->string):2 * strlen_m(r->string));
-	ndr_print_uint16(ndr, "size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?2 * strlen_m(r->string):2 * strlen_m(r->string));
+	ndr_print_uint16(ndr, "length", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?2 * strlen_m(r->string):r->length);
+	ndr_print_uint16(ndr, "size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?2 * strlen_m(r->string):r->size);
 	ndr_print_ptr(ndr, "string", r->string);
 	ndr->depth++;
 	if (r->string) {
@@ -135,8 +135,8 @@
 {
 	ndr_print_struct(ndr, name, "lsa_StringLarge");
 	ndr->depth++;
-	ndr_print_uint16(ndr, "length", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?2 * strlen_m(r->string):2 * strlen_m(r->string));
-	ndr_print_uint16(ndr, "size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?2 * (strlen_m(r->string) + 1):2 * (strlen_m(r->string) + 1));
+	ndr_print_uint16(ndr, "length", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?2 * strlen_m(r->string):r->length);
+	ndr_print_uint16(ndr, "size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?2 * (strlen_m(r->string) + 1):r->size);
 	ndr_print_ptr(ndr, "string", r->string);
 	ndr->depth++;
 	if (r->string) {
@@ -299,8 +299,8 @@
 {
 	ndr_print_struct(ndr, name, "lsa_AsciiString");
 	ndr->depth++;
-	ndr_print_uint16(ndr, "length", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m(r->string):strlen_m(r->string));
-	ndr_print_uint16(ndr, "size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m(r->string):strlen_m(r->string));
+	ndr_print_uint16(ndr, "length", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m(r->string):r->length);
+	ndr_print_uint16(ndr, "size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m(r->string):r->size);
 	ndr_print_ptr(ndr, "string", r->string);
 	ndr->depth++;
 	if (r->string) {

Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_netlogon.c
===================================================================
--- branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_netlogon.c	2007-03-02 14:05:52 UTC (rev 21654)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_netlogon.c	2007-03-02 14:26:19 UTC (rev 21655)
@@ -495,7 +495,7 @@
 		ndr_set_flags(&ndr->flags, LIBNDR_PRINT_ARRAY_HEX);
 		ndr->depth++;
 		ndr_print_uint16(ndr, "length", r->length);
-		ndr_print_uint16(ndr, "size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?r->length:r->length);
+		ndr_print_uint16(ndr, "size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?r->length:r->size);
 		ndr_print_ptr(ndr, "data", r->data);
 		ndr->depth++;
 		if (r->data) {
@@ -2031,7 +2031,7 @@
 	ndr_print_struct(ndr, name, "netr_USER_KEY16");
 	ndr->depth++;
 	ndr_print_uint16(ndr, "length", r->length);
-	ndr_print_uint16(ndr, "size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?r->length:r->length);
+	ndr_print_uint16(ndr, "size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?r->length:r->size);
 	ndr_print_uint32(ndr, "flags", r->flags);
 	ndr_print_samr_Password(ndr, "pwd", &r->pwd);
 	ndr->depth--;

Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_winreg.c
===================================================================
--- branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_winreg.c	2007-03-02 14:05:52 UTC (rev 21654)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_winreg.c	2007-03-02 14:26:19 UTC (rev 21655)
@@ -125,8 +125,8 @@
 {
 	ndr_print_struct(ndr, name, "winreg_String");
 	ndr->depth++;
-	ndr_print_uint16(ndr, "name_len", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m_term(r->name) * 2:strlen_m_term(r->name) * 2);
-	ndr_print_uint16(ndr, "name_size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m_term(r->name) * 2:strlen_m_term(r->name) * 2);
+	ndr_print_uint16(ndr, "name_len", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m_term(r->name) * 2:r->name_len);
+	ndr_print_uint16(ndr, "name_size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m_term(r->name) * 2:r->name_size);
 	ndr_print_ptr(ndr, "name", r->name);
 	ndr->depth++;
 	if (r->name) {
@@ -332,7 +332,7 @@
 {
 	ndr_print_struct(ndr, name, "winreg_StringBuf");
 	ndr->depth++;
-	ndr_print_uint16(ndr, "length", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m_term_null(r->name) * 2:strlen_m_term_null(r->name) * 2);
+	ndr_print_uint16(ndr, "length", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m_term_null(r->name) * 2:r->length);
 	ndr_print_uint16(ndr, "size", r->size);
 	ndr_print_ptr(ndr, "name", r->name);
 	ndr->depth++;
@@ -403,7 +403,7 @@
 {
 	ndr_print_struct(ndr, name, "winreg_ValNameBuf");
 	ndr->depth++;
-	ndr_print_uint16(ndr, "length", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m_term(r->name) * 2:strlen_m_term(r->name) * 2);
+	ndr_print_uint16(ndr, "length", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m_term(r->name) * 2:r->length);
 	ndr_print_uint16(ndr, "size", r->size);
 	ndr_print_ptr(ndr, "name", r->name);
 	ndr->depth++;