From 0aa89db9471330fd02db395c2eb387ac2dfef54f Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Sat, 26 Mar 2005 06:52:56 +0000 Subject: r6071: * clean up UNISTR2_ARRAY ( really just an array of UNISTR4 + count ) * add some backwards compatibility to 'net rpc rights list' * verify privilege name in 'net rpc rights privileges ' in order to give back better error messages. (This used to be commit 0e29dc8aa384dfa6d2495beb8a9ffb5371e60a13) --- source3/include/rpc_misc.h | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) (limited to 'source3/include/rpc_misc.h') diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h index 16611fe955..d5dc35f6c7 100644 --- a/source3/include/rpc_misc.h +++ b/source3/include/rpc_misc.h @@ -182,13 +182,6 @@ typedef struct unistr2_info uint16 *buffer; } UNISTR2; -/* UNIHDR + UNISTR2* */ -typedef struct { - uint16 length; /* number of bytes not counting NULL terminatation */ - uint16 size; /* number of bytes including NULL terminatation */ - UNISTR2 *string; -} UNISTR4; - /* STRING2 - string size (in uint8 chars) and buffer */ typedef struct string2_info { @@ -206,22 +199,18 @@ typedef struct unistr3_info } UNISTR3; -/* an element in a unicode string array */ -typedef struct -{ - uint16 length; - uint16 size; - uint32 ref_id; - UNISTR2 string; -} UNISTR2_ARRAY_EL; +/* UNIHDR + UNISTR2* */ -/* an array of unicode strings */ -typedef struct -{ - uint32 ref_id; +typedef struct { + uint16 length; /* number of bytes not counting NULL terminatation */ + uint16 size; /* number of bytes including NULL terminatation */ + UNISTR2 *string; +} UNISTR4; + +typedef struct { uint32 count; - UNISTR2_ARRAY_EL *strings; -} UNISTR2_ARRAY; + UNISTR4 *strings; +} UNISTR4_ARRAY; /* an element in a sid array */ -- cgit