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 /wireshark-qt.cpp | |
| parent | 445ddc833669e8cff7e66b268d4b4b77faa504cc (diff) | |
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 'wireshark-qt.cpp')
| -rw-r--r-- | wireshark-qt.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index 8a87010023..f5c83e08f9 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -58,6 +58,12 @@ #include <epan/column.h> #include <epan/disabled_protos.h> +#if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS) +#include <epan/packet.h> +#include <epan/asn1.h> +#include <epan/dissectors/packet-kerberos.h> +#endif + #ifdef HAVE_PLUGINS #include <codecs/codecs.h> #endif |