Rev 5319: Regenerate after pidl bugfix. in file:///home/jelmer/bzr.samba/SAMBA_3_0/

Jelmer Vernooij jelmer at samba.org
Fri Mar 2 14:24:43 GMT 2007


At file:///home/jelmer/bzr.samba/SAMBA_3_0/

------------------------------------------------------------
revno: 5319
revision-id: jelmer at samba.org-20070302142434-z9yri1i7zdaxmjvs
parent: svn-v2:21652 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_3_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_3_0
timestamp: Fri 2007-03-02 15:24:34 +0100
message:
  Regenerate after pidl bugfix.
modified:
  source/librpc/gen_ndr/ndr_initshutdown.c svn-v2:18560 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_3_0-source%2flibrpc%2fgen_ndr%2fndr_initshutdown.c
  source/librpc/gen_ndr/ndr_lsa.c svn-v2:18271 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_3_0-source%2flibrpc%2fgen_ndr%2fndr_lsa.c
  source/librpc/gen_ndr/ndr_netlogon.c svn-v2:18666 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_3_0-source%2flibrpc%2fgen_ndr%2fndr_netlogon.c
  source/librpc/gen_ndr/ndr_winreg.c svn-v2:18560 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_3_0-source%2flibrpc%2fgen_ndr%2fndr_winreg.c
=== modified file 'source/librpc/gen_ndr/ndr_initshutdown.c'
--- a/source/librpc/gen_ndr/ndr_initshutdown.c	2007-02-27 17:17:16 +0000
+++ b/source/librpc/gen_ndr/ndr_initshutdown.c	2007-03-02 14:24:34 +0000
@@ -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 file 'source/librpc/gen_ndr/ndr_lsa.c'
--- a/source/librpc/gen_ndr/ndr_lsa.c	2007-02-27 17:17:16 +0000
+++ b/source/librpc/gen_ndr/ndr_lsa.c	2007-03-02 14:24:34 +0000
@@ -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 file 'source/librpc/gen_ndr/ndr_netlogon.c'
--- a/source/librpc/gen_ndr/ndr_netlogon.c	2007-02-27 17:17:16 +0000
+++ b/source/librpc/gen_ndr/ndr_netlogon.c	2007-03-02 14:24:34 +0000
@@ -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 file 'source/librpc/gen_ndr/ndr_winreg.c'
--- a/source/librpc/gen_ndr/ndr_winreg.c	2007-02-27 17:17:16 +0000
+++ b/source/librpc/gen_ndr/ndr_winreg.c	2007-03-02 14:24:34 +0000
@@ -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++;



More information about the samba-cvs mailing list