svn commit: samba r7870 - in branches/SAMBA_4_0/source/librpc/idl: .

[tridge at samba.org]

Author: tridge
Date: 2005-06-24 04:25:40 +0000 (Fri, 24 Jun 2005)
New Revision: 7870

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

Log:
fixed the RPC-SCHANNEL test. It turned out it was my const changes, as
they slightly changed the semantics of value() in pidl, which broke
a optimisation hack in some of our IDL files.

I've changed the idl files to remove the hack for now. Sometime we
need to find a better way to handle these :-)

Modified:
   branches/SAMBA_4_0/source/librpc/idl/eventlog.idl
   branches/SAMBA_4_0/source/librpc/idl/lsa.idl
   branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
   branches/SAMBA_4_0/source/librpc/idl/samr.idl
   branches/SAMBA_4_0/source/librpc/idl/winreg.idl


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/eventlog.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/eventlog.idl	2005-06-24 03:52:08 UTC (rev 7869)
+++ branches/SAMBA_4_0/source/librpc/idl/eventlog.idl	2005-06-24 04:25:40 UTC (rev 7870)
@@ -18,7 +18,7 @@
 
 	typedef struct {
 		[value(2*strlen_m(name))] uint16 name_len;
-		[value(name_len)]       uint16 name_size;
+		[value(2*strlen_m(name))] uint16 name_size;
 		unistr_noterm *name;
 	} eventlog_String;
 

Modified: branches/SAMBA_4_0/source/librpc/idl/lsa.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/lsa.idl	2005-06-24 03:52:08 UTC (rev 7869)
+++ branches/SAMBA_4_0/source/librpc/idl/lsa.idl	2005-06-24 04:25:40 UTC (rev 7870)
@@ -32,7 +32,7 @@
 
 	typedef struct {
 		[value(2*strlen_m(string))] uint16 length;
-		[value(length)] uint16 size;
+		[value(2*strlen_m(string))] uint16 size;
 		unistr_noterm *string;
 	} lsa_String;
 

Modified: branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/netlogon.idl	2005-06-24 03:52:08 UTC (rev 7869)
+++ branches/SAMBA_4_0/source/librpc/idl/netlogon.idl	2005-06-24 04:25:40 UTC (rev 7870)
@@ -21,7 +21,7 @@
 
 	typedef [public] struct {
 		[value(strlen_m(string)*2)]  uint16 size;
-		[value(size)]                uint16 length;
+		[value(strlen_m(string)*2)]  uint16 length;
 		unistr_noterm *string;
 	} netr_String;
 	

Modified: branches/SAMBA_4_0/source/librpc/idl/samr.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/samr.idl	2005-06-24 03:52:08 UTC (rev 7869)
+++ branches/SAMBA_4_0/source/librpc/idl/samr.idl	2005-06-24 04:25:40 UTC (rev 7870)
@@ -79,7 +79,7 @@
 	/* Function: 0x05 */
 	typedef struct {
 		[value(2*strlen_m(string))] uint16 length;
-		[value(length)] uint16 size;
+		[value(2*strlen_m(string))] uint16 size;
 		unistr_noterm *string;
 	} samr_String;	
 

Modified: branches/SAMBA_4_0/source/librpc/idl/winreg.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/winreg.idl	2005-06-24 03:52:08 UTC (rev 7869)
+++ branches/SAMBA_4_0/source/librpc/idl/winreg.idl	2005-06-24 04:25:40 UTC (rev 7870)
@@ -16,7 +16,7 @@
 {
 	typedef struct {
 		[value(strlen_m_term(name)*2)] uint16 name_len;
-		[value(name_len)]              uint16 name_size;
+		[value(strlen_m_term(name)*2)] uint16 name_size;
 		unistr *name;
 	} winreg_String;