diff options
| author | Dario Lombardo <lomato@gmail.com> | 2020-06-01 23:21:54 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal@wireshark.org> | 2020-06-04 08:50:11 +0000 |
| commit | 4ae362383ff5e4f0adb4cee2f615309b320c0224 (patch) | |
| tree | 7884039d066463861238b6aba794dc428d7d2f56 /epan/dissectors/asn1 | |
| parent | 12c3a29cbcd4e0a7b2dd43c60dd49e5a2de5034b (diff) | |
kerberos: move krb5.h include upwards.
FreeBSD defines constants such as KRB5_KU_USAGE_ACCEPTOR_SEAL
as part of the krb5_key_usage struct. Having such a defines
causes a clash that breaks the compilation. The struct needs to be
included first.
Error:
In file included from ./asn1/kerberos/packet-kerberos-template.c:413:
/usr/include/krb5.h:255:5: error: expected identifier
KRB5_KU_USAGE_ACCEPTOR_SEAL = 22,
^
./asn1/kerberos/packet-kerberos-template.h:22:41: note: expanded from macro 'KRB5_KU_USAGE_ACCEPTOR_SEAL'
#define KRB5_KU_USAGE_ACCEPTOR_SEAL 22
^
Change-Id: Ic241f2b6a2c01e7bd6c84d05e509f12e738ab2ac
Reviewed-on: https://code.wireshark.org/review/37358
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Diffstat (limited to 'epan/dissectors/asn1')
| -rw-r--r-- | epan/dissectors/asn1/kerberos/packet-kerberos-template.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/epan/dissectors/asn1/kerberos/packet-kerberos-template.c b/epan/dissectors/asn1/kerberos/packet-kerberos-template.c index 2c854ce0a6..406b69e655 100644 --- a/epan/dissectors/asn1/kerberos/packet-kerberos-template.c +++ b/epan/dissectors/asn1/kerberos/packet-kerberos-template.c @@ -44,6 +44,15 @@ #include <stdio.h> +// krb5.h needs to be included before the defines in packet-kerberos.h +#if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS) +#ifdef _WIN32 +/* prevent redefinition warnings in krb5's win-mac.h */ +#define SSIZE_T_DEFINED +#endif /* _WIN32 */ +#include <krb5.h> +#endif + #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/strutil.h> @@ -406,11 +415,6 @@ read_keytab_file_from_preferences(void) #endif /* HAVE_KERBEROS */ #if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS) -#ifdef _WIN32 -/* prevent redefinition warnings in krb5's win-mac.h */ -#define SSIZE_T_DEFINED -#endif /* _WIN32 */ -#include <krb5.h> enc_key_t *enc_key_list=NULL; static guint kerberos_longterm_ids = 0; wmem_map_t *kerberos_longterm_keys = NULL; |