summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-10-16 19:12:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:44:49 -0500
commit3f3388a5648b41a22a399a73f484fb1ce5d539bd (patch)
tree4ad666f2cbad24e2cbaba88c9a3c10ddb3f16eff /source4
parent9fe24f4e9cc6ed681ab6d58cc2a1737f2651ce9a (diff)
downloadsamba-3f3388a5648b41a22a399a73f484fb1ce5d539bd.tar.gz
samba-3f3388a5648b41a22a399a73f484fb1ce5d539bd.tar.bz2
samba-3f3388a5648b41a22a399a73f484fb1ce5d539bd.zip
r11102: Remove unistr_noterm
(This used to be commit bb1ed44f45020f1e11d928f5130a889c11ee59c4)
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/idl/idl_types.h6
-rw-r--r--source4/librpc/idl/lsa.idl2
2 files changed, 1 insertions, 7 deletions
diff --git a/source4/librpc/idl/idl_types.h b/source4/librpc/idl/idl_types.h
index e48df9ddfd..872883df4b 100644
--- a/source4/librpc/idl/idl_types.h
+++ b/source4/librpc/idl/idl_types.h
@@ -13,12 +13,6 @@
#define STR_LARGE_SIZE LIBNDR_FLAG_STR_LARGE_SIZE
/*
- a UCS2 string prefixed with [size] [offset] [length], all 32 bits
- not null terminated
-*/
-#define unistr_noterm [flag(STR_NOTERM|STR_SIZE4|STR_LEN4)] string
-
-/*
a UCS2 string prefixed with [size], 32 bits
*/
#define lstring [flag(STR_SIZE4)] string
diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl
index 824ebac689..465c757784 100644
--- a/source4/librpc/idl/lsa.idl
+++ b/source4/librpc/idl/lsa.idl
@@ -17,7 +17,7 @@
typedef [public,noejs] struct {
[value(2*strlen_m(string))] uint16 length;
[value(2*strlen_m(string))] uint16 size;
- unistr_noterm *string;
+ [charset(UTF16),size_is(size),length_is(length)] uint8 *string;
} lsa_String;
typedef [public] struct {