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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f68f892e452cd48cc7c607223deac0765dfe0504
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

f68f892 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    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@xxxxxxxxx>
    (cherry picked from commit c326fcaf9b0c1f0421c67a9ba4a929e19bce1054)
    Conflicts:
    	epan/dissectors/packet-ldap.c
    Reviewed-on: https://code.wireshark.org/review/6613
    

Actions performed:

    from  b3abc55   DHCP/BOOTP: Option 125 Suboption: (1) option-len always expects 1 but specification allows for more
    adds  f68f892   LDAP: g8c608e6 did not include the changes in template file, that got lost afterwards


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