diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-03-10 20:01:59 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-03-10 19:04:38 +0000 |
| commit | 7f61e90eebddb7244c66bf94c970a5fd44781cb2 (patch) | |
| tree | 38899f38e9d2c9b1dbb04cf25778760d98e3ddef | |
| parent | 16d8525a8091d19e30c9bef67f391fc1678b42ea (diff) | |
SPNEGO: fix compilation without Kerberos
Remove a dead increment while we are at it
Change-Id: I4a453bbd959e71ff6e85be06d079176abdc33a95
Reviewed-on: https://code.wireshark.org/review/7622
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
| -rw-r--r-- | asn1/spnego/packet-spnego-template.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-spnego.c | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c index edce351c9e..262eef5386 100644 --- a/asn1/spnego/packet-spnego-template.c +++ b/asn1/spnego/packet-spnego-template.c @@ -1037,11 +1037,13 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo * We handle only the two common cases for now * (rrc == 0 and rrc == ec) */ +#if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS) if (rrc == ec) { proto_tree_add_item(tree, hf_spnego_krb5_sgn_cksum, tvb, offset, checksum_size, ENC_NA); offset += checksum_size; } +#endif returned_offset = offset; pinfo->gssapi_wrap_tvb = tvb_new_subset_length(tvb, offset, @@ -1049,10 +1051,12 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo offset += inner_token_len; - if (rrc == 0) { +#if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS) + if (rrc == 0) +#endif + { proto_tree_add_item(tree, hf_spnego_krb5_sgn_cksum, tvb, offset, checksum_size, ENC_NA); - offset += checksum_size; } /* diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index 7681475ef1..1236a687cf 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -1489,11 +1489,13 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo * We handle only the two common cases for now * (rrc == 0 and rrc == ec) */ +#if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS) if (rrc == ec) { proto_tree_add_item(tree, hf_spnego_krb5_sgn_cksum, tvb, offset, checksum_size, ENC_NA); offset += checksum_size; } +#endif returned_offset = offset; pinfo->gssapi_wrap_tvb = tvb_new_subset_length(tvb, offset, @@ -1501,10 +1503,12 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo offset += inner_token_len; - if (rrc == 0) { +#if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS) + if (rrc == 0) +#endif + { proto_tree_add_item(tree, hf_spnego_krb5_sgn_cksum, tvb, offset, checksum_size, ENC_NA); - offset += checksum_size; } /* @@ -1955,7 +1959,7 @@ void proto_register_spnego(void) { NULL, HFILL }}, /*--- End of included file: packet-spnego-hfarr.c ---*/ -#line 1410 "../../asn1/spnego/packet-spnego-template.c" +#line 1414 "../../asn1/spnego/packet-spnego-template.c" }; /* List of subtrees */ @@ -1978,7 +1982,7 @@ void proto_register_spnego(void) { &ett_spnego_InitialContextToken_U, /*--- End of included file: packet-spnego-ettarr.c ---*/ -#line 1420 "../../asn1/spnego/packet-spnego-template.c" +#line 1424 "../../asn1/spnego/packet-spnego-template.c" }; static ei_register_info ei[] = { |