aboutsummaryrefslogtreecommitdiffstats
path: root/wireshark-qt.cpp
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-01-02 16:27:24 -0800
committerGuy Harris <guy@alum.mit.edu>2015-01-03 00:27:57 +0000
commit33ba8d384d8e2e721bad4cb61737bb58dec0e142 (patch)
tree9e38528713d496e3a7922c6876535b16fc5ee61e /wireshark-qt.cpp
parentd1d5bf121e3fa4571b25c1bfd5a00f859d997e34 (diff)
Support -K iff HAVE_KERBEROS is defined.
This *shouldn't* make a difference, but it's a bit clearer, and, if it *does* make a difference with some build, there's a bug in the configuration process for that build. Clean up indentation while we're at it. Change-Id: I94aa6d565c3d5545620a7aeeaabce03153ec5e1c Reviewed-on: https://code.wireshark.org/review/6257 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wireshark-qt.cpp')
-rw-r--r--wireshark-qt.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index f5c83e08f9..1bd2f6d61b 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -58,7 +58,7 @@
#include <epan/column.h>
#include <epan/disabled_protos.h>
-#if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS)
+#ifdef HAVE_KERBEROS
#include <epan/packet.h>
#include <epan/asn1.h>
#include <epan/dissectors/packet-kerberos.h>
@@ -876,9 +876,9 @@ int main(int argc, char *argv[])
arg_error = TRUE;
#endif
break;
-#if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS)
+#ifdef HAVE_KERBEROS
case 'K': /* Kerberos keytab file */
- read_keytab_file(optarg);
+ read_keytab_file(optarg);
break;
#endif