r7870: 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 :-)
(This used to be commit 765f75ea630b13b1605409ff47a52cc11a1e496b)

diff --git a/source4/librpc/idl/eventlog.idl b/source4/librpc/idl/eventlog.idl
index 48cc9f3a5428c5fd43753a67a37ad21e7a88c5c4..aded89ebf65900faff2d0bbc0bc6d57762e6c8e4 100644 (file)
--- a/source4/librpc/idl/eventlog.idl
+++ b/source4/librpc/idl/eventlog.idl
@@ -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;
 

diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl
index 32c7abd33208e2040f6f7c02cc6bffee6687ca94..82f56847211e6f9bcf9840a478d64bd59e2cc61f 100644 (file)
--- a/source4/librpc/idl/lsa.idl
+++ b/source4/librpc/idl/lsa.idl
@@ -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;
 

diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index 9d32c102e880ca5725821c1f248ba72683e3fa48..e30bf4dc8b86bcfd37a021e3027be4e15fa41fb5 100644 (file)
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -21,7 +21,7 @@ interface netlogon
 
        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;
        

diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index c399ee4fb8ecc195645fdfab99fff1823a66104c..cf610113873f6d167e23f8bf0d9027d9381bef9a 100644 (file)
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -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;  
 

diff --git a/source4/librpc/idl/winreg.idl b/source4/librpc/idl/winreg.idl
index 327e6834f832df3c0348106a4d5e46b1634e9720..dc5ccdd02dc6a4f70f5006ac5ae706476056ce71 100644 (file)
--- a/source4/librpc/idl/winreg.idl
+++ b/source4/librpc/idl/winreg.idl
@@ -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;