diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-01-18 12:22:22 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-01-18 11:25:07 +0000 |
| commit | c326fcaf9b0c1f0421c67a9ba4a929e19bce1054 (patch) | |
| tree | 89fcc515d19db48744a66f6b2a2a31db47bf7b1b /epan/dissectors/packet-ldap.c | |
| parent | 13b1e907f108d3978f09c5fb2fa33bd09d6bb8af (diff) | |
LDAP: g8c608e6 did not include the changes in template file, that got lost afterwards
Change-Id: I5d79d3e48c1ad83713a312dce39b749f47b0ecc8
Reviewed-on: https://code.wireshark.org/review/6612
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ldap.c')
| -rw-r--r-- | epan/dissectors/packet-ldap.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 88f1d48bb7..430675d8bf 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -4135,6 +4135,8 @@ static void /* if we could unwrap, do a tvb shuffle */ if(pinfo->gssapi_decrypted_tvb){ decr_tvb=pinfo->gssapi_decrypted_tvb; + } else if (pinfo->gssapi_wrap_tvb) { + plain_tvb=pinfo->gssapi_wrap_tvb; } /* tidy up */ pinfo->decrypt_gssapi_tvb=0; @@ -4155,7 +4157,7 @@ static void * see if the wrapping involved encryption of the * data; if not, just use the plaintext data. */ - if (!decr_tvb) { + if (!decr_tvb && !plain_tvb) { if(!pinfo->gssapi_data_encrypted){ plain_tvb = tvb_new_subset_remaining(gssapi_tvb, ver_len); } @@ -5731,7 +5733,7 @@ void proto_register_ldap(void) { NULL, HFILL }}, /*--- End of included file: packet-ldap-hfarr.c ---*/ -#line 2228 "../../asn1/ldap/packet-ldap-template.c" +#line 2230 "../../asn1/ldap/packet-ldap-template.c" }; /* List of subtrees */ @@ -5805,7 +5807,7 @@ void proto_register_ldap(void) { &ett_ldap_T_warning, /*--- End of included file: packet-ldap-ettarr.c ---*/ -#line 2242 "../../asn1/ldap/packet-ldap-template.c" +#line 2244 "../../asn1/ldap/packet-ldap-template.c" }; /* UAT for header fields */ static uat_field_t custom_attribute_types_uat_fields[] = { @@ -5971,7 +5973,7 @@ proto_reg_handoff_ldap(void) /*--- End of included file: packet-ldap-dis-tab.c ---*/ -#line 2391 "../../asn1/ldap/packet-ldap-template.c" +#line 2393 "../../asn1/ldap/packet-ldap-template.c" } |