--- lib/saslutil.c.orig	2011-10-22 17:06:12.000000000 -0700
+++ lib/saslutil.c	2011-10-22 17:15:00.000000000 -0700
@@ -556,7 +556,11 @@
 		  &hints,
 		  &result) != 0) {
 	/* errno on Unix, WSASetLastError on Windows are already done by the function */
-	return (-1);
+	if (abort_if_no_fqdn) {
+	    return (-1);
+	} else {
+	    goto LOWERCASE;
+	}
     }
 
     if (abort_if_no_fqdn && (result == NULL || result->ai_canonname == NULL)) {