aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/kerberos/packet-kerberos-template.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-01-03 03:06:53 -0800
committerGuy Harris <guy@alum.mit.edu>2015-01-03 11:07:26 +0000
commit61c6fb828123a2dd6c77687cba52cf59b1f956bb (patch)
tree1ad0023ef6c86c1f2a26048265b806b2e0ad2139 /asn1/kerberos/packet-kerberos-template.c
parent544ed8adcf4c057216deab3f6c46dd4f5003ebf9 (diff)
Remove the probes from packet-kerberos.c.
None of HAVE_KERBEROS, HAVE_MIT_KERBEROS or HAVE_HEIMDAL_KERBEROS or HAVE_LIBNETTLE defined when it's compiled. So how is HAVE_KERBEROS getting defined when wireshark-qt.cpp is compiled? Change-Id: If238ff54aa4f0cda662c7a52d76e33363a77240d Reviewed-on: https://code.wireshark.org/review/6262 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'asn1/kerberos/packet-kerberos-template.c')
-rw-r--r--asn1/kerberos/packet-kerberos-template.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c
index 0e59345ad1..810999e468 100644
--- a/asn1/kerberos/packet-kerberos-template.c
+++ b/asn1/kerberos/packet-kerberos-template.c
@@ -628,10 +628,6 @@ clear_keytab(void) {
service_key_list = NULL;
}
-#ifdef _WIN32
-#error "HAVE_LIBNETTLE defined"
-#endif
-
static void
read_keytab_file(const char *service_key_file)
{
@@ -782,16 +778,6 @@ 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