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.

diff --git a/source/include/rpc_misc.h b/source/include/rpc_misc.h
index bad2089ac7b13d794b5e37a4b6a86dce55df5c4e..661d436859afccd917d45b5d4aaaa34606359883 100644 (file)
--- a/source/include/rpc_misc.h
+++ b/source/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/source/rpc_parse/parse_misc.c b/source/rpc_parse/parse_misc.c
index 5973deefd0566b2469e469668b82e4df01e35ead..f030e266df594c51d81046ae68a26e4c8031d48a 100644 (file)
--- a/source/rpc_parse/parse_misc.c
+++ b/source/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;