Merge pull request #630 from surevine/dnsoverrides

OF-1172 Add support for a wildcard DNS override

Merge pull request #630 from surevine/dnsoverrides
OF-1172 Add support for a wildcard DNS override
dafd766f · Guus der Kinderen · GitHub · 7f084676 · 79c7a4d6 · dafd766f
Commit dafd766f authored Aug 16, 2016 by Guus der Kinderen Committed by GitHub Aug 16, 2016
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

DNSUtil.java src/java/org/jivesoftware/openfire/net/DNSUtil.java +3 -0

No files found.
--- a/src/java/org/jivesoftware/openfire/net/DNSUtil.java
+++ b/src/java/org/jivesoftware/openfire/net/DNSUtil.java
@@ -88,6 +88,9 @@ public class DNSUtil {
        List<HostAddress> results = new LinkedList<>();
        if (dnsOverride != null) {
            HostAddress hostAddress = dnsOverride.get(domain);
+            if (hostAddress == null) {
+                hostAddress = dnsOverride.get("*");
+            }
            if (hostAddress != null) {
                results.add(hostAddress);
                return results;