diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-10-30 18:47:59 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-10-31 05:05:50 +0000 |
commit | 5aacafba8e53b3c17f00181e91418927d1c94efe (patch) | |
tree | f570d5f90dbd6e2bbfd4687dea5a813fa4c22b9c /epan/dissectors/packet-kerberos.h | |
parent | 706c10663499b90639ab8e46e171c4d4952778bf (diff) |
Handle -K, -n, -N, and -u in the common dissection option code.
Also update tfshark to use that code.
Change-Id: Ic03fb8ff48c8bfc460298d180b436e53f0076cbe
Reviewed-on: https://code.wireshark.org/review/18588
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-kerberos.h')
-rw-r--r-- | epan/dissectors/packet-kerberos.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/epan/dissectors/packet-kerberos.h b/epan/dissectors/packet-kerberos.h index d838e82a6e..901567ac50 100644 --- a/epan/dissectors/packet-kerberos.h +++ b/epan/dissectors/packet-kerberos.h @@ -100,12 +100,6 @@ decrypt_krb5_data(proto_tree *tree, packet_info *pinfo, extern gboolean krb_decrypt; -WS_DLL_PUBLIC -void read_keytab_file(const char *); - -WS_DLL_PUBLIC -void read_keytab_file_from_preferences(void); - #endif /* HAVE_KERBEROS */ @@ -134,7 +128,7 @@ void read_keytab_file_from_preferences(void); int dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /*--- End of included file: packet-kerberos-exp.h ---*/ -#line 104 "./asn1/kerberos/packet-kerberos-template.h" +#line 98 "./asn1/kerberos/packet-kerberos-template.h" #ifdef __cplusplus } |