diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c
index bc64e8dd8d3..1226ed6c182 100644
--- a/source4/libcli/resolve/dns_ex.c
+++ b/source4/libcli/resolve/dns_ex.c
@@ -400,8 +400,10 @@ static void run_child_getaddrinfo(struct dns_ex_state *state, int fd)
 #ifdef EAI_NODATA
 		case EAI_NODATA:
 #endif
+		case EAI_FAIL:
+			/* Linux returns EAI_NODATA on non-RFC1034-compliant names. FreeBSD returns EAI_FAIL */
 		case EAI_NONAME:
-			/* getaddrinfo() doesn't handle CNAME records */
+			/* getaddrinfo() doesn't handle CNAME or non-RFC1034 compatible records */
 			run_child_dns_lookup(state, fd);
 			return;
 		default: