summaryrefslogtreecommitdiff
path: root/source4/librpc
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-11-23 10:50:52 +0000
committerTim Potter <tpot@samba.org>2003-11-23 10:50:52 +0000
commitc071301a77b1987526f42c8877336a1f6a1bfa7e (patch)
tree6664a2820f69608b555d4da5fe66cfa00744af7f /source4/librpc
parent1b9452ffc5d21bcc621806273a1ab0366843451f (diff)
downloadsamba-c071301a77b1987526f42c8877336a1f6a1bfa7e.tar.gz
samba-c071301a77b1987526f42c8877336a1f6a1bfa7e.tar.bz2
samba-c071301a77b1987526f42c8877336a1f6a1bfa7e.zip
Add a strlen_m_term() function for returning the length of a string
including the termination. Using value(strlen_m((r->name)+1)*2) gives the wrong answer for the NULL string. (This used to be commit 7ae329e6630a07d29f83b6dd4572d26ab8a18c71)
Diffstat (limited to 'source4/librpc')
-rw-r--r--source4/librpc/idl/winreg.idl4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/librpc/idl/winreg.idl b/source4/librpc/idl/winreg.idl
index c7dc3942df..263946bdda 100644
--- a/source4/librpc/idl/winreg.idl
+++ b/source4/librpc/idl/winreg.idl
@@ -10,8 +10,8 @@
] interface winreg
{
typedef struct {
- [value(2*(strlen_m(r->name)+1))] uint16 name_len;
- [value(r->name_len)] uint16 name_size;
+ [value(strlen_m_term(r->name)*2)] uint16 name_len;
+ [value(r->name_len)] uint16 name_size;
unistr *name;
} winreg_String;