summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-06-24 04:25:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:45 -0500
commit7fc49243f35a5c9bdd8bfefba6e2833b5a812448 (patch)
tree09c72f2ec8afa0b7284362e319760f922ee5475d
parent4cb6899428e0acbd3d1f368908b23a79cccd407f (diff)
downloadsamba-7fc49243f35a5c9bdd8bfefba6e2833b5a812448.tar.gz
samba-7fc49243f35a5c9bdd8bfefba6e2833b5a812448.tar.bz2
samba-7fc49243f35a5c9bdd8bfefba6e2833b5a812448.zip
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)
-rw-r--r--source4/librpc/idl/eventlog.idl2
-rw-r--r--source4/librpc/idl/lsa.idl2
-rw-r--r--source4/librpc/idl/netlogon.idl2
-rw-r--r--source4/librpc/idl/samr.idl2
-rw-r--r--source4/librpc/idl/winreg.idl2
5 files changed, 5 insertions, 5 deletions
diff --git a/source4/librpc/idl/eventlog.idl b/source4/librpc/idl/eventlog.idl
index 48cc9f3a54..aded89ebf6 100644
--- 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 32c7abd332..82f5684721 100644
--- 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 9d32c102e8..e30bf4dc8b 100644
--- 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 c399ee4fb8..cf61011387 100644
--- 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 327e6834f8..dc5ccdd02d 100644
--- 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;