Changeset 155

Timestamp:

12/20/06 18:44:51 (2 years ago)

Author:

jfp

Message:

Fix dns resolution

Files:

• trunk/jsmtpd/src/org/jsmtpd/plugins/deliveryServices/RemoteSmtpSender.java (modified) (2 diffs)

trunk/jsmtpd/src/org/jsmtpd/plugins/deliveryServices/RemoteSmtpSender.java

@@ -71 +71 @@
-        log.info("delivering mail from " + in.getFrom().toString() + " to domain " + domain);
-        
-// Query DNS, for each DNS try send message.
+
-        IDNSResolver resolver = PluginStore.getInstance().getResolver();
-        List smtpServers = resolver.doMXLookup(domain);
+        
+        for (Inet4Address addr : bogusDNS) {
+            if (smtpServers.contains(addr)) {
+                log.warn("Bogus dns removed: ("+addr.toString()+")");
+                smtpServers.remove(addr);
+            }     
+        }
+        
-        if (smtpServers.size() == 0) {
-
+valid 
-            // Mark all rcpt as error fatal
-            for (Iterator iterator = rcpts.iterator(); iterator.hasNext();) {
@@ -87 +95 @@
-        for (Iterator iter = smtpServers.iterator(); iter.hasNext();) {
-            InetAddress element = (InetAddress) iter.next();
-            for (Inet4Address addr : bogusDNS) {
-                if (addr.equals(element)) {
-                    log.warn("this DNS resolution won't be used ("+element.toString()+")");
-                    continue;
-                }     
-            }
-            // TODO: check against ACL ?
-            
-            log.debug("trying " + element.toString());