summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-03-02 23:32:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:10:54 -0500
commita7552e677ed1c2df795c844987a7b7036c93bb35 (patch)
tree644ffcd90dad4c4174ebf5791f66e087e8378f35
parentc44de10a2bf4ed1d382ecf6940ffe393e92c5d27 (diff)
downloadsamba-a7552e677ed1c2df795c844987a7b7036c93bb35.tar.gz
samba-a7552e677ed1c2df795c844987a7b7036c93bb35.tar.bz2
samba-a7552e677ed1c2df795c844987a7b7036c93bb35.zip
r13802: I *knew* ASU on sparc had to be good for *something* ! :-).
Fix incorrect size understanding of sid name type (yes it's already correct in the Samba4 IDL :-). Jeremy. (This used to be commit 305a774d2880a57d1ebdf2ecf2d7e0b519695a33)
-rw-r--r--source3/include/rpc_misc.h4
-rw-r--r--source3/rpc_parse/parse_misc.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index bad2089ac7..661d436859 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -266,14 +266,14 @@ typedef struct {
/* DOM_RID - domain RID structure for ntlsa pipe */
typedef struct {
- uint8 type; /* value is SID_NAME_USE enum */
+ uint16 type; /* value is SID_NAME_USE enum */
uint32 rid;
uint32 rid_idx; /* referenced domain index */
} DOM_RID;
/* DOM_RID2 - second domain RID structure for ntlsa pipe */
typedef struct {
- uint8 type; /* value is SID_NAME_USE enum */
+ uint16 type; /* value is SID_NAME_USE enum */
uint32 rid;
uint32 rid_idx; /* referenced domain index */
uint32 unknown;
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index 5973deefd0..f030e266df 100644
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -1254,7 +1254,7 @@ BOOL smb_io_account_lockout_str(const char *desc, LOCKOUT_STRING *account_lockou
Inits a DOM_RID structure.
********************************************************************/
-void init_dom_rid(DOM_RID *prid, uint32 rid, uint8 type, uint32 idx)
+void init_dom_rid(DOM_RID *prid, uint32 rid, uint16 type, uint32 idx)
{
prid->type = type;
prid->rid = rid;
@@ -1276,7 +1276,7 @@ BOOL smb_io_dom_rid(const char *desc, DOM_RID *rid, prs_struct *ps, int depth)
if(!prs_align(ps))
return False;
- if(!prs_uint8("type ", ps, depth, &rid->type))
+ if(!prs_uint16("type ", ps, depth, &rid->type))
return False;
if(!prs_align(ps))
return False;
@@ -1303,7 +1303,7 @@ BOOL smb_io_dom_rid2(const char *desc, DOM_RID2 *rid, prs_struct *ps, int depth)
if(!prs_align(ps))
return False;
- if(!prs_uint8("type ", ps, depth, &rid->type))
+ if(!prs_uint16("type ", ps, depth, &rid->type))
return False;
if(!prs_align(ps))
return False;