diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-02-04 12:18:37 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-02-06 08:07:10 +0000 |
| commit | 881ff5df92a1c12a3afaeea3f422cb36f6e84b59 (patch) | |
| tree | 9349e94359edc5f9c7d65112671b05af60898ae5 /epan/dissectors/packet-kerberos.c | |
| parent | d6ebb82ed24bb556d18d70bd2eb77947c07b94ff (diff) | |
| download | wireshark-881ff5df92a1c12a3afaeea3f422cb36f6e84b59.tar.gz | |
Remove gethostbyaddr and gethostbyaddr2.
They've been deprecated for a very long time. Replace them with
getaddrinfo. Note that we might not want to do synchronous name
resolution at all.
Add HAVE_GETADDRINFO to the KfW win-mac.h collision list.
Change-Id: If59ce8a038776eadd6cd1794ed0e2dad8bf8a22c
Reviewed-on: https://code.wireshark.org/review/6958
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-kerberos.c')
| -rw-r--r-- | epan/dissectors/packet-kerberos.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 4d06d5f421..4ede65f03b 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -512,6 +512,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 @@ -4244,7 +4245,7 @@ dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, /*--- End of included file: packet-kerberos-fn.c ---*/ -#line 1984 "../../asn1/kerberos/packet-kerberos-template.c" +#line 1985 "../../asn1/kerberos/packet-kerberos-template.c" /* Make wrappers around exported functions for now */ int @@ -5282,7 +5283,7 @@ void proto_register_kerberos(void) { NULL, HFILL }}, /*--- End of included file: packet-kerberos-hfarr.c ---*/ -#line 2365 "../../asn1/kerberos/packet-kerberos-template.c" +#line 2366 "../../asn1/kerberos/packet-kerberos-template.c" }; /* List of subtrees */ @@ -5356,7 +5357,7 @@ void proto_register_kerberos(void) { &ett_kerberos_ChangePasswdData, /*--- End of included file: packet-kerberos-ettarr.c ---*/ -#line 2381 "../../asn1/kerberos/packet-kerberos-template.c" +#line 2382 "../../asn1/kerberos/packet-kerberos-template.c" }; static ei_register_info ei[] = { |