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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ef8f915c9dfcf2418ba0d788cda23347e36c3ecf
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

ef8f915 by Stefan Metzmacher (metze@xxxxxxxxx):

    packet-kerberos: rename some generated fields to avoid name conflicts
    
    The following changes would otherwise create conflicts.
    
    Change-Id: I80bf9270aa1bdc1b92602ef68c9bfbf2b2b7ee37
    Signed-off-by: Stefan Metzmacher <metze@xxxxxxxxx>
    Reviewed-on: https://code.wireshark.org/review/36471
    Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  68087ab   packet-kerberos: dissect PA_REQ_ENC_PA_REP
     add  ef8f915   packet-kerberos: rename some generated fields to avoid name conflicts


Summary of changes:
 epan/dissectors/asn1/kerberos/kerberos.cnf |  3 ++
 epan/dissectors/packet-kerberos.c          | 82 +++++++++++++++---------------
 2 files changed, 44 insertions(+), 41 deletions(-)