Remove the testing stuff.

The problem was probably that we had two competing config.h files, with
some source files including one of them and othe source files including
the other, with the nmake config.h defining HAVE_KERBEROS and
HAVE_MIT_KERBEROS and the CMake config.h defining neither, and with
wireshark-qt.cpp including the nmake config.h, so that it expected there
to be a read_keytab_file() routine, and
epan/dissectors/packet-kerberos.c including the CMake config.h, so that
it didn't define a read_keytab_file() routine.

(If the CMake build is done out-of-tree, with its config.h file outside
the source tree, and the nmake build done in-tree, with its config.h in
the top-level source directory, wireshark-qt.cpp, in the top-level
source directory, might pick up the config.h in the same directory, but
epan/dissectors/packet-kerberos.c doesn't have a config.h in its source
directory and might pick up the config.h from the CMake build
directory.)

Change-Id: I040126026c4101aca1264affc04e585fee89b87b
Reviewed-on: https://code.wireshark.org/review/6272
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 0 insertions, 11 deletions

diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index c60b373b0b..1bd2f6d61b 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -876,17 +876,6 @@ int main(int argc, char *argv[])
             arg_error = TRUE;
 #endif
             break;
-#ifdef _WIN32
-#ifdef HAVE_KERBEROS
-#ifndef HAVE_MIT_KERBEROS
-#ifdef HAVE_HEIMDAL_KERBEROS
-#error "HAVE_KERBEROS defined, HAVE_MIT_KERBEROS not defined, HAVE_HEIMDAL_KERBEROS defined"
-#else
-#error "HAVE_KERBEROS defined, neither HAVE_MIT_KERBEROS nor HAVE_HEIMDAL_KERBEROS defined"
-#endif /* HAVE_HEIMDAL_KERBEROS */
-#endif /* HAVE_MIT_KERBEROS */
-#endif /* HAVE_KERBEROS */
-#endif /* _WIN32 */
 #ifdef HAVE_KERBEROS
         case 'K':        /* Kerberos keytab file */
             read_keytab_file(optarg);