aboutsummaryrefslogtreecommitdiffstats
path: root/packet-kerberos.c
diff options
context:
space:
mode:
authorsahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>2004-05-26 11:04:15 +0000
committersahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>2004-05-26 11:04:15 +0000
commitc373fc8ac64a7efe98b350c68ec968db7a10d03b (patch)
tree09a262620ef1b282303b82b6dd2e674839c7ccde /packet-kerberos.c
parent835950a78dcbd3e253c5e2d2608308d1d08ee9cc (diff)
remove the SAFE_BODY expansion to make KRB5_MSG_SAFE look more consistent
with the other application dissectors. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11007 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-kerberos.c')
-rw-r--r--packet-kerberos.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/packet-kerberos.c b/packet-kerberos.c
index 3d5030b479..d062e1b28a 100644
--- a/packet-kerberos.c
+++ b/packet-kerberos.c
@@ -23,7 +23,7 @@
*
* Some structures from RFC2630
*
- * $Id: packet-kerberos.c,v 1.65 2004/05/26 08:53:45 sahlberg Exp $
+ * $Id: packet-kerberos.c,v 1.66 2004/05/26 11:04:15 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -208,7 +208,6 @@ static gint hf_krb_KDCOptions_renew = -1;
static gint hf_krb_KDCOptions_validate = -1;
static gint hf_krb_KDC_REQ_BODY = -1;
static gint hf_krb_SAFE = -1;
-static gint hf_krb_SAFE_BODY = -1;
static gint hf_krb_PRIV_BODY = -1;
static gint hf_krb_ENC_PRIV = -1;
static gint hf_krb_authenticator_enc = -1;
@@ -253,7 +252,6 @@ static gint ett_krb_recordmark = -1;
static gint ett_krb_ticket = -1;
static gint ett_krb_ticket_enc = -1;
static gint ett_krb_SAFE = -1;
-static gint ett_krb_SAFE_BODY = -1;
static gint ett_krb_PRIV = -1;
static gint ett_krb_PRIV_enc = -1;
@@ -2526,7 +2524,7 @@ static int
dissect_krb5_SAFE_BODY(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
{
- offset=dissect_ber_sequence(FALSE, pinfo, tree, tvb, offset, SAFE_BODY_sequence, hf_krb_SAFE_BODY, ett_krb_SAFE_BODY);
+ offset=dissect_ber_sequence(FALSE, pinfo, tree, tvb, offset, SAFE_BODY_sequence, -1, -1);
return offset;
}
@@ -3491,9 +3489,6 @@ proto_register_kerberos(void)
{ &hf_krb_SAFE, {
"SAFE", "kerberos.safe", FT_NONE, BASE_NONE,
NULL, 0, "Kerberos SAFE structure", HFILL }},
- { &hf_krb_SAFE_BODY, {
- "SAFE BODY", "kerberos.safe_body", FT_NONE, BASE_NONE,
- NULL, 0, "Kerberos SAFE_BODY structure", HFILL }},
{ &hf_krb_encrypted_PRIV, {
"Encrypted PRIV", "kerberos.enc_priv", FT_NONE, BASE_NONE,
NULL, 0, "Kerberos Encrypted PRIVate blob data", HFILL }},
@@ -3738,7 +3733,6 @@ proto_register_kerberos(void)
&ett_krb_ticket,
&ett_krb_ticket_enc,
&ett_krb_SAFE,
- &ett_krb_SAFE_BODY,
&ett_krb_PRIV,
&ett_krb_PRIV_enc,
&ett_krb_EncTicketPart,