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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b358b870b3df572d3d8b0f3d16f1b5188cc549c3
Submitter: Martin Mathieson (martin.r.mathieson@xxxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

b358b87 by Martin Mathieson (martin.r.mathieson@xxxxxxxxxxxxxx):

    Snort: without explicit disable, expand preference to switch off
    
    Change-Id: I5fd3b0cc6f19c4c873aaaae8c9e257a8b53a8419
    Reviewed-on: https://code.wireshark.org/review/19489
    Petri-Dish: Martin Mathieson <martin.r.mathieson@xxxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Martin Mathieson <martin.r.mathieson@xxxxxxxxxxxxxx>
    

Actions performed:

    from  b380013   [Automatic update for 2017-01-01]
    adds  b358b87   Snort: without explicit disable, expand preference to switch off


Summary of changes:
 epan/dissectors/packet-snort.c |   24 +++++++++++++++---------
 epan/dissectors/snort-config.c |    2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)