A little clarification in the rpc auth header struct.

Volker
(This used to be commit 9fc3e4bf9fa7845b5d4a7eb4cacfec586045ebd0)

2 files changed, 10 insertions, 12 deletions

diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h
index 7e8bc3949e..22dae7ce36 100644
--- a/source3/include/rpc_dce.h
+++ b/source3/include/rpc_dce.h
@@ -197,10 +197,10 @@ typedef struct rpc_hdr_auth_info
 {
 	uint8 auth_type; /* 0x0a */
 	uint8 auth_level; /* 0x06 */
-	uint8 stub_type_len; /* don't know */
-	uint8 padding; /* padding */
+	uint8 padding;
+	uint8 reserved; /* padding */
 
-	uint32 unknown; /* pointer */
+	uint32 auth_context; /* pointer */
 
 } RPC_HDR_AUTH;
 
@@ -229,7 +229,6 @@ typedef struct rpc_auth_netsec_chk_info
 
 struct netsec_auth_struct
 {
-	RPC_AUTH_NETSEC_NEG netsec_neg;
 	uchar sess_key[16];
 	uint32 seq_num;
 };
diff --git a/source3/rpc_parse/parse_rpc.c b/source3/rpc_parse/parse_rpc.c
index baa70ae137..700ce8cfd6 100644
--- a/source3/rpc_parse/parse_rpc.c
+++ b/source3/rpc_parse/parse_rpc.c
@@ -607,15 +607,15 @@ BOOL rpc_hdr_auth_chk(RPC_HDR_AUTH *rai)
 
 void init_rpc_hdr_auth(RPC_HDR_AUTH *rai,
 				uint8 auth_type, uint8 auth_level,
-				uint8 stub_type_len,
+				uint8 padding,
 				uint32 ptr)
 {
 	rai->auth_type     = auth_type; /* nt lm ssp 0x0a */
 	rai->auth_level    = auth_level; /* 0x06 */
-	rai->stub_type_len = stub_type_len; /* 0x00 */
-	rai->padding       = 0; /* padding 0x00 */
+	rai->padding       = padding;
+	rai->reserved      = 0;
 
-	rai->unknown       = ptr; /* non-zero pointer to something */
+	rai->auth_context  = ptr; /* non-zero pointer to something */
 }
 
 /*******************************************************************
@@ -637,12 +637,11 @@ BOOL smb_io_rpc_hdr_auth(const char *desc, RPC_HDR_AUTH *rai, prs_struct *ps, in
 		return False;
 	if(!prs_uint8 ("auth_level   ", ps, depth, &rai->auth_level)) /* 0x06 */
 		return False;
-	if(!prs_uint8 ("stub_type_len", ps, depth, &rai->stub_type_len))
-		return False;
 	if(!prs_uint8 ("padding      ", ps, depth, &rai->padding))
 		return False;
-
-	if(!prs_uint32("unknown      ", ps, depth, &rai->unknown)) /* 0x0014a0c0 */
+	if(!prs_uint8 ("reserved     ", ps, depth, &rai->reserved))
+		return False;
+	if(!prs_uint32("auth_context ", ps, depth, &rai->auth_context))
 		return False;
 
 	return True;