svn commit: samba r13802 - in branches/SAMBA_3_0/source: include rpc_parse

[jra at samba.org]

Author: jra
Date: 2006-03-02 23:32:44 +0000 (Thu, 02 Mar 2006)
New Revision: 13802

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13802

Log:
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.

Modified:
   branches/SAMBA_3_0/source/include/rpc_misc.h
   branches/SAMBA_3_0/source/rpc_parse/parse_misc.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/rpc_misc.h
===================================================================
--- branches/SAMBA_3_0/source/include/rpc_misc.h	2006-03-02 23:32:41 UTC (rev 13801)
+++ branches/SAMBA_3_0/source/include/rpc_misc.h	2006-03-02 23:32:44 UTC (rev 13802)
@@ -266,14 +266,14 @@
 
 /* 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;

Modified: branches/SAMBA_3_0/source/rpc_parse/parse_misc.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_parse/parse_misc.c	2006-03-02 23:32:41 UTC (rev 13801)
+++ branches/SAMBA_3_0/source/rpc_parse/parse_misc.c	2006-03-02 23:32:44 UTC (rev 13802)
@@ -1254,7 +1254,7 @@
  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 @@
 	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 @@
 	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;