Wireshark-commits: [Wireshark-commits] master-2.2 85f9638: spnego: use same name define name from k

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 4 Oct 2016 22:44:57 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=85f96388877282d1c4f382cd8fd8f678ef5fcba7
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

85f9638 by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    spnego: use same name define name from krb5
    
    and for heimdal lib add the value
    
    Bug:12831
    Change-Id: Ibf04560867acfe2a430034248ce2a386ea89b668
    Reviewed-on: https://code.wireshark.org/review/17988
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit da8969ceefbcc1ad19f36309ccb5b208c6324b5c)
    Reviewed-on: https://code.wireshark.org/review/18076
    

Actions performed:

    from  1ca224e   2.2.1 → 2.2.2.
    adds  85f9638   spnego: use same name define name from krb5


Summary of changes:
 .../asn1/spnego/packet-spnego-template.c           |    5 ++++-
 epan/dissectors/packet-spnego.c                    |    9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)