From 3f3388a5648b41a22a399a73f484fb1ce5d539bd Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 16 Oct 2005 19:12:02 +0000 Subject: r11102: Remove unistr_noterm (This used to be commit bb1ed44f45020f1e11d928f5130a889c11ee59c4) --- source4/librpc/idl/idl_types.h | 6 ------ source4/librpc/idl/lsa.idl | 2 +- 2 files changed, 1 insertion(+), 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 @@ -12,12 +12,6 @@ #define STR_UTF8 LIBNDR_FLAG_STR_UTF8 #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 */ 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 { -- cgit