diff options
author | Guy Harris <guy@alum.mit.edu> | 2015-01-01 15:05:25 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2015-01-01 23:05:57 +0000 |
commit | 5981dab95b87ffd629d6ab6a45289af60c3d3b27 (patch) | |
tree | b8af9ede813e8b720737c28f2e07be1c3e1f3834 /tshark.c | |
parent | 445ddc833669e8cff7e66b268d4b4b77faa504cc (diff) | |
download | wireshark-5981dab95b87ffd629d6ab6a45289af60c3d3b27.tar.gz wireshark-5981dab95b87ffd629d6ab6a45289af60c3d3b27.tar.bz2 wireshark-5981dab95b87ffd629d6ab6a45289af60c3d3b27.zip |
Declare read_keytab_file() in epan/dissectors/packet-kerberos.h.
Don't throw its declaration in file.h, as it's not defined in file.c.
Instead, include it in epan/dissectors/packet-kerberos.h and include
that wherever read_keytab_file() is called.
Yes, that means you also have to include <epan/asn1.h> and, therefore,
you have to include <epan/packet.h>. Yes, that should be cleaned up,
perhaps by splitting the Kerberos support code into "stuff that handles
encryption keys without any reference to dissection" and "stuff that
does dissection-related work".
Change-Id: Ide5c31e6d85e6011d57202f728dbc656e36138ef
Reviewed-on: https://code.wireshark.org/review/6210
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tshark.c')
-rw-r--r-- | tshark.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -105,6 +105,11 @@ #include <epan/conversation_table.h> #include <epan/ex-opt.h> +#if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS) +#include <epan/asn1.h> +#include <epan/dissectors/packet-kerberos.h> +#endif + #include "capture_opts.h" #include "caputils/capture-pcap-util.h" |