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 /asn1/kerberos | |
| 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 'asn1/kerberos')
| -rw-r--r-- | asn1/kerberos/packet-kerberos-template.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c index 810999e468..0e59345ad1 100644 --- a/asn1/kerberos/packet-kerberos-template.c +++ b/asn1/kerberos/packet-kerberos-template.c @@ -628,6 +628,10 @@ clear_keytab(void) { service_key_list = NULL; } +#ifdef _WIN32 +#error "HAVE_LIBNETTLE defined" +#endif + static void read_keytab_file(const char *service_key_file) { @@ -778,6 +782,16 @@ decrypt_krb5_data(proto_tree *tree, packet_info *pinfo, return NULL; } +#else + +#ifdef _WIN32 +#ifdef HAVE_KERBEROS +#error "HAVE_KERBEROS defined, but none of HAVE_MIT_KERBEROS or HAVE_HEIMDAL_KERBEROS or HAVE_LIBNETTLE defined" +#else +#error "None of HAVE_KERBEROS, HAVE_MIT_KERBEROS or HAVE_HEIMDAL_KERBEROS or HAVE_LIBNETTLE defined" +#endif +#endif + #endif /* HAVE_MIT_KERBEROS / HAVE_HEIMDAL_KERBEROS / HAVE_LIBNETTLE */ #define INET6_ADDRLEN 16 |