check of inet_pton instead for AF_INET6

diff --git a/configure.ac b/configure.ac
index 936978e3bcc333dee7ed9cb8eb40db8c7d433ba8..0a6f7c0363f08893d24df446fa16bca8c7f70cee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -145,7 +145,7 @@ AC_C_BIGENDIAN
 
 dnl No fork on MinGW, disable some self-tests until we fix them.
 dnl Check clock_gettime and pthread_mutex_lock in libc (avoid linking to other libs)
-AC_CHECK_FUNCS([fork inet_ntop getrusage getpwuid_r nanosleep daemon getpid clock_gettime iconv localtime vasprintf],,)
+AC_CHECK_FUNCS([fork inet_ntop inet_pton getrusage getpwuid_r nanosleep daemon getpid clock_gettime iconv localtime vasprintf],,)
 AM_CONDITIONAL(HAVE_FORK, test "$ac_cv_func_fork" != "no")
 
 AC_LIB_HAVE_LINKFLAGS(rt,, [#include <time.h>

diff --git a/lib/x509/rfc2818_hostname.c b/lib/x509/rfc2818_hostname.c
index 725a861bc85a3fbac50ac1dd1396dd1f42425031..ee21458c083662a8757508e06a778328e345281e 100644 (file)
--- a/lib/x509/rfc2818_hostname.c
+++ b/lib/x509/rfc2818_hostname.c
@@ -123,7 +123,7 @@ gnutls_x509_crt_check_hostname2(gnutls_x509_crt_t cert,
        if ((p=strchr(hostname, ':')) != NULL || inet_aton(hostname, &ipv4) != 0) {
 
                if (p != NULL) {
-#ifdef AF_INET6
+#ifdef HAVE_INET_PTON
                        struct in6_addr ipv6;
 
                        ret = inet_pton(AF_INET6, hostname, &ipv6);