diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-01-03 03:06:53 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-01-03 11:07:26 +0000 |
| commit | 61c6fb828123a2dd6c77687cba52cf59b1f956bb (patch) | |
| tree | 1ad0023ef6c86c1f2a26048265b806b2e0ad2139 | |
| parent | 544ed8adcf4c057216deab3f6c46dd4f5003ebf9 (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>
| -rw-r--r-- | asn1/kerberos/packet-kerberos-template.c | 14 | ||||
| -rw-r--r-- | epan/dissectors/packet-kerberos.c | 20 |
2 files changed, 3 insertions, 31 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 diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 3258f83380..29e4581f76 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -879,10 +879,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) { @@ -1033,16 +1029,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 @@ -4256,7 +4242,7 @@ dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, /*--- End of included file: packet-kerberos-fn.c ---*/ -#line 1996 "../../asn1/kerberos/packet-kerberos-template.c" +#line 1982 "../../asn1/kerberos/packet-kerberos-template.c" /* Make wrappers around exported functions for now */ int @@ -5294,7 +5280,7 @@ void proto_register_kerberos(void) { NULL, HFILL }}, /*--- End of included file: packet-kerberos-hfarr.c ---*/ -#line 2377 "../../asn1/kerberos/packet-kerberos-template.c" +#line 2363 "../../asn1/kerberos/packet-kerberos-template.c" }; /* List of subtrees */ @@ -5368,7 +5354,7 @@ void proto_register_kerberos(void) { &ett_kerberos_ChangePasswdData, /*--- End of included file: packet-kerberos-ettarr.c ---*/ -#line 2393 "../../asn1/kerberos/packet-kerberos-template.c" +#line 2379 "../../asn1/kerberos/packet-kerberos-template.c" }; static ei_register_info ei[] = { |