diff options
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/rpc_lsa.h | 8 | ||||
-rw-r--r-- | source3/include/rpc_misc.h | 31 | ||||
-rw-r--r-- | source3/include/rpc_svcctl.h | 2 |
3 files changed, 15 insertions, 26 deletions
diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h index 507161109f..69d8f53a6d 100644 --- a/source3/include/rpc_lsa.h +++ b/source3/include/rpc_lsa.h @@ -68,7 +68,7 @@ #define LSA_LOOKUPPRIVNAME 0x20 #define LSA_PRIV_GET_DISPNAME 0x21 #define LSA_DELETEOBJECT 0x22 -#define LSA_ENUMACCTWITHRIGHT 0x23 +#define LSA_ENUMACCTWITHRIGHT 0x23 /* TODO: implement this one -- jerry */ #define LSA_ENUMACCTRIGHTS 0x24 #define LSA_ADDACCTRIGHTS 0x25 #define LSA_REMOVEACCTRIGHTS 0x26 @@ -532,7 +532,7 @@ typedef struct typedef struct { uint32 count; - UNISTR2_ARRAY rights; + UNISTR4_ARRAY *rights; NTSTATUS status; } LSA_R_ENUM_ACCT_RIGHTS; @@ -542,8 +542,8 @@ typedef struct { POLICY_HND pol; /* policy handle */ DOM_SID2 sid; - UNISTR2_ARRAY rights; uint32 count; + UNISTR4_ARRAY *rights; } LSA_Q_ADD_ACCT_RIGHTS; /* LSA_R_ADD_ACCT_RIGHTS - LSA add account rights */ @@ -559,8 +559,8 @@ typedef struct POLICY_HND pol; /* policy handle */ DOM_SID2 sid; uint32 removeall; - UNISTR2_ARRAY rights; uint32 count; + UNISTR4_ARRAY *rights; } LSA_Q_REMOVE_ACCT_RIGHTS; /* LSA_R_REMOVE_ACCT_RIGHTS - LSA remove account rights */ 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 */ diff --git a/source3/include/rpc_svcctl.h b/source3/include/rpc_svcctl.h index fd24ec7ca9..90b90bd24b 100644 --- a/source3/include/rpc_svcctl.h +++ b/source3/include/rpc_svcctl.h @@ -166,7 +166,7 @@ typedef struct { typedef struct { POLICY_HND handle; uint32 parmcount; - UNISTR2_ARRAY parameters; + UNISTR4_ARRAY *parameters; } SVCCTL_Q_START_SERVICE; typedef struct { |