X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fping%2FDNSPinger.java;h=eb6327b3f9a2968cd98332091b01bdbdf3a49d56;hp=5e735e096fbcec40ca89655e58128c5c16895210;hb=d7be034f96e06985f57d86d2779c434276b5bd4d;hpb=5dcfbec6497e6b11aff12b7c1a1e187f3b6b30fb

diff --git a/src/org/cacert/gigi/ping/DNSPinger.java b/src/org/cacert/gigi/ping/DNSPinger.java
index 5e735e09..eb6327b3 100644
--- a/src/org/cacert/gigi/ping/DNSPinger.java
+++ b/src/org/cacert/gigi/ping/DNSPinger.java
@@ -5,20 +5,21 @@ import java.util.List;
 
 import javax.naming.NamingException;
 
-import org.cacert.gigi.Domain;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.CertificateOwner;
+import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.util.DNSUtil;
 
 public class DNSPinger extends DomainPinger {
 
     @Override
-    public String ping(Domain domain, String expToken, User u) {
+    public void ping(Domain domain, String expToken, CertificateOwner u, int confId) {
         String[] tokenParts = expToken.split(":", 2);
         List<String> nameservers;
         try {
             nameservers = Arrays.asList(DNSUtil.getNSNames(domain.getSuffix()));
         } catch (NamingException e) {
-            return "No authorative nameserver found.";
+            enterPingResult(confId, "error", "No authorative nameserver found.", null);
+            return;
         }
         StringBuffer result = new StringBuffer();
         result.append("failed: ");
@@ -27,7 +28,7 @@ public class DNSPinger extends DomainPinger {
         for (String NS : nameservers) {
             boolean found = false;
             try {
-                for (String token : DNSUtil.getTXTEntries("cacert-" + tokenParts[0] + "." + domain.getSuffix(), NS)) {
+                for (String token : DNSUtil.getTXTEntries(tokenParts[0] + "._cacert._auth." + domain.getSuffix(), NS)) {
                     if (token.isEmpty()) {
                         continue;
                     }
@@ -49,8 +50,9 @@ public class DNSPinger extends DomainPinger {
 
         }
         if ( !failed) {
-            return PING_SUCCEDED;
+            enterPingResult(confId, PING_SUCCEDED, "", null);
+        } else {
+            enterPingResult(confId, "error", result.toString(), null);
         }
-        return result.toString();
     }
 }