diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-03-10 20:01:59 +0100 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-03-11 16:28:03 +0000 |
| commit | 333e3d80b4dea0ad35b882d0f95fc949f21e72b5 (patch) | |
| tree | 94a412d9924f90bdf40fbb9c9455762bfba971aa | |
| parent | f33ca351d8b54a3858504b7f36d6ac2a5ca7ec6f (diff) | |
| download | wireshark-333e3d80b4dea0ad35b882d0f95fc949f21e72b5.tar.gz wireshark-333e3d80b4dea0ad35b882d0f95fc949f21e72b5.tar.bz2 wireshark-333e3d80b4dea0ad35b882d0f95fc949f21e72b5.zip | |
SPNEGO: fix compilation without Kerberos
Remove a dead increment while we are at it
Conflicts:
epan/dissectors/packet-spnego.c
Change-Id: I4a453bbd959e71ff6e85be06d079176abdc33a95
Reviewed-on: https://code.wireshark.org/review/7622
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-on: https://code.wireshark.org/review/7628
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@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 11c00b4695..086e0d8be1 100644 --- a/asn1/spnego/packet-spnego-template.c +++ b/asn1/spnego/packet-spnego-template.c @@ -1052,11 +1052,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, @@ -1064,10 +1066,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 98d1e85424..143edc0164 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -1504,11 +1504,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, @@ -1516,10 +1518,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; } /* @@ -1971,7 +1975,7 @@ void proto_register_spnego(void) { NULL, HFILL }}, /*--- End of included file: packet-spnego-hfarr.c ---*/ -#line 1426 "../../asn1/spnego/packet-spnego-template.c" +#line 1414 "../../asn1/spnego/packet-spnego-template.c" }; /* List of subtrees */ @@ -1994,7 +1998,7 @@ void proto_register_spnego(void) { &ett_spnego_InitialContextToken_U, /*--- End of included file: packet-spnego-ettarr.c ---*/ -#line 1436 "../../asn1/spnego/packet-spnego-template.c" +#line 1424 "../../asn1/spnego/packet-spnego-template.c" }; /* Register protocol */ |