diff options
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/kerberos/packet-kerberos-template.c | 1 | ||||
| -rw-r--r-- | asn1/kerberos/packet-kerberos-template.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c index ed3137dc40..9a111da625 100644 --- a/asn1/kerberos/packet-kerberos-template.c +++ b/asn1/kerberos/packet-kerberos-template.c @@ -261,6 +261,7 @@ read_keytab_file_from_preferences(void) #if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS) #ifdef _WIN32 /* prevent redefinition warnings in kfw-2.5\inc\win_mac.h */ +#undef HAVE_GETADDRINFO #undef HAVE_STDARG_H #undef HAVE_STDLIB_H #undef HAVE_STRING_H diff --git a/asn1/kerberos/packet-kerberos-template.h b/asn1/kerberos/packet-kerberos-template.h index 64e2ae8263..871a1211a1 100644 --- a/asn1/kerberos/packet-kerberos-template.h +++ b/asn1/kerberos/packet-kerberos-template.h @@ -60,7 +60,7 @@ int dissect_krb5_cname(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t * int dissect_krb5_realm(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_); guint32 kerberos_output_keytype(void); -guint get_krb_pdu_len(packet_info *, tvbuff_t *tvb, int offset); +guint get_krb_pdu_len(packet_info *, tvbuff_t *tvb, int offset, void *data _U_); gint kerberos_rm_to_reclen(guint krb_rm); |