[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=333e3d80b4dea0ad35b882d0f95fc949f21e72b5
Submitter: Evan Huus (eapache@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

333e3d8 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    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@xxxxxxxxx>
    Reviewed-on: https://code.wireshark.org/review/7628
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
    

Actions performed:

    from  f33ca35   packet-ldap: use the correct tvb to report the SASL wrapped payload
    adds  333e3d8   SPNEGO: fix compilation without Kerberos


Summary of changes:
 asn1/spnego/packet-spnego-template.c |    8 ++++++--
 epan/dissectors/packet-spnego.c      |   12 ++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)