diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-01-02 23:41:28 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-01-03 07:42:17 +0000 |
| commit | 544ed8adcf4c057216deab3f6c46dd4f5003ebf9 (patch) | |
| tree | d86e88968a50b2898fec3fa3e3b50ba82c60ca44 /wireshark-qt.cpp | |
| parent | 16fe32f408c49f21206d750b7601de5c4ddca41c (diff) | |
Stick some #define probes in on Windows.
Let's try to figure out why, on the 64-bit Windows build,
wireshark-qt.cpp is being compiled to call read_keytab_file() but
packet-kerberos.c is not being compiled to define it.
Change-Id: I782406e2189819d9400b84b6632fe0fb62c5996d
Reviewed-on: https://code.wireshark.org/review/6261
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wireshark-qt.cpp')
| -rw-r--r-- | wireshark-qt.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index 1919b17a5e..c60b373b0b 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -876,8 +876,18 @@ int main(int argc, char *argv[]) arg_error = TRUE; #endif break; -#if 0 -/* #ifdef HAVE_KERBEROS */ +#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); break; |