r11102: Remove unistr_noterm

(This used to be commit bb1ed44f45020f1e11d928f5130a889c11ee59c4)

diff --git a/source4/librpc/idl/idl_types.h b/source4/librpc/idl/idl_types.h
index e48df9ddfd059e574f6f0d2eb412e7166c94b36c..872883df4b180612aa878923a5074cd0902aaf28 100644 (file)
--- 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 824ebac689a2e9e3f33cf9834815692c103c2baa..465c75778432ebeb5b65ce8a1e5099c70b9dfb91 100644 (file)
--- 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 {