Extra paranoia checks if dn_skipname/dn_expand exist or not

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 31c7f54e07e94a171e1d763312617d76caf10952..76d27ece2fda50add42b0b07cc81a2b7953ad272 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -598,8 +598,10 @@ function_entry basic_functions[] = {
 #if HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(PHP_WIN32) || defined(NETWARE))
        PHP_FE(dns_check_record,                                                                                                NULL)
        PHP_FALIAS(checkdnsrr,                  dns_check_record,                                               NULL)
+# if HAVE_DN_SKIPNAME && HAVE_DN_EXPAND
        PHP_FE(dns_get_mx,                              second_and_third_args_force_ref)
        PHP_FALIAS(getmxrr,                     dns_get_mx, second_and_third_args_force_ref)
+# endif
 # if HAVE_DNS_FUNCS
        PHP_FE(dns_get_record,                  third_and_rest_force_ref)
 # endif

diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index e170a85e3c2ad190415d246cf7c823c7da32d1ff..d8799d863fd2d2c321a6f5cefde363822084ac7c 100644 (file)
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -632,6 +632,7 @@ PHP_FUNCTION(dns_get_record)
 /* }}} */
 #endif /* HAVE_DNS_FUNCS */
 
+#if HAVE_DN_SKIPNAME && HAVE_DN_EXPAND
 /* {{{ proto bool dns_get_mx(string hostname, array mxhosts [, array weight])
    Get MX records corresponding to a given Internet host name */
 PHP_FUNCTION(dns_get_mx)
@@ -712,6 +713,7 @@ PHP_FUNCTION(dns_get_mx)
        RETURN_TRUE;
 }
 /* }}} */
+#endif /* HAVE_DN_SKIPNAME && HAVE_DN_EXPAND */
 
 #endif /* HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) || defined(NETWARE)) */
 

diff --git a/ext/standard/dns.h b/ext/standard/dns.h
index 51519c85cafd6cea439ae51ee98aa01c31ff4c6f..303d4705dc9dd6db33bcb0b5ae931a575ed20019 100644 (file)
--- a/ext/standard/dns.h
+++ b/ext/standard/dns.h
@@ -34,7 +34,9 @@ PHP_FUNCTION(gethostbynamel);
 #if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32))
 
 PHP_FUNCTION(dns_check_record);
+# if HAVE_DN_SKIPNAME && HAVE_DN_EXPAND
 PHP_FUNCTION(dns_get_mx);
+# endif
 
 # if HAVE_DNS_FUNCS