aboutsummaryrefslogtreecommitdiffstats
path: root/tfshark.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-01-01 15:05:25 -0800
committerGuy Harris <guy@alum.mit.edu>2015-01-01 23:05:57 +0000
commit5981dab95b87ffd629d6ab6a45289af60c3d3b27 (patch)
treeb8af9ede813e8b720737c28f2e07be1c3e1f3834 /tfshark.c
parent445ddc833669e8cff7e66b268d4b4b77faa504cc (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 'tfshark.c')
-rw-r--r--tfshark.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/tfshark.c b/tfshark.c
index 8b1b43a23f..0132208e60 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -89,6 +89,12 @@
#include <epan/tap.h>
#include <epan/stat_tap_ui.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 <wiretap/wtap-int.h>
#include <wiretap/file_wrappers.h>