ChangeLog

@@ -1,12 +1,3 @@
-Version 0.6.3 (unreleased)
-
-* Change mail address.
-  Thomas Hochstein <thh@thh.name> Sun Aug 23 22:37:10 2020 +0200
-
-* Fix display of CNAME/A records in log file.
-  Thomas Hochstein <thh@inter.net> Sat Jan 9 12:34:21 2016 +0100
-
-
 Version 0.6.2 (2016-01-09)
 
 * Try to handle CNAMEs and resolve them to A records.

README.md

@@ -1,13 +0,0 @@
-# checkmail
-
-## Description
-
-**checkmail** determines the mail server (or servers) responsible for the domain of the mail address (MXes); if none are available, it falls back on the host with the corresponding name (if available). It then establishes an SMTP connection and goes through the SMTP dialogue until just before an email is actually sent and checks whether mail to the recipient address would be accepted in principle. If desired, checkmail can also test sending to an address that is certainly invalid in order to check whether the replies from the recipient mail server are reliable at all or whether every recipient address is accepted (initially).
-
-The sender of the apparent test email and the HELO parameter to be used can be configured in the script or passed as a parameter during the call.
-
-Additional options can be used to check several addresses present in a text file, to display the complete SMTP dialogue or to force a connection to a specific mail server (instead of checking the relevant MXes).
-
-## More information
-
-Please see the [distribution page](https://th-h.de/net/software/checkmail/) (in German).

checkmail.pl

@@ -1,15 +1,15 @@
 #! /usr/bin/perl -w
 #
-# checkmail Version 0.6.3 by Thomas Hochstein
+# checkmail Version 0.6.1 by Thomas Hochstein
 #
 # This script tries to verify the deliverability of (a) mail address(es).
 # 
-# Copyright (c) 2002-2016 Thomas Hochstein <thh@thh.name>
+# Copyright (c) 2002-2011 Thomas Hochstein <thh@inter.net>
 #
 # It can be redistributed and/or modified under the same terms under 
 # which Perl itself is published.
 
-our $VERSION = "0.6.3 (unreleased)";
+our $VERSION = "0.6.2";
 
 ################################# Configuration ################################
 # Please fill in a working configuration!
@@ -39,7 +39,7 @@ getopts('Vhqlrf:m:s:e:', \%options);
 
 # -V: display version
 if ($options{'V'}) {
-  print "$myself v $VERSION\nCopyright (c) 2002-2016 Thomas Hochstein <thh\@thh.name>\n";
+  print "$myself v $VERSION\nCopyright (c) 2010-2016 Thomas Hochstein <thh\@inter.net>\n";
   print "This program is free software; you may redistribute it and/or modify it under the same terms as Perl itself.\n";
   exit(100);
 };
@@ -154,23 +154,27 @@ sub gettargets {
   # no MX record found; log and try A record(s)
   } else {
     print_dns_result($domain,'MX',undef,$resolver->errorstring,$logr);
-    print("    Falling back to A record(s) ...\n") if !($options{'q'});
+    print("    Falling back to A record ...\n") if !($options{'q'});
     # get A record(s)
     # may get CNAMEs instead ...
     if (my $query = $resolver->query($domain,'A','IN')) {
-      print_dns_result($domain,'A/CNAME',$query->header->ancount,undef,$logr);
+      # save number of answers in a counter
+      my $acount = $query->header->ancount;
       foreach my $rr ($query->answer) {
         if ($rr->type ne 'A') {
+          # decrease counter if it's not an A record
+          $acount--;
           # report CNAMEs and don't add them to target list
           if ($rr->type eq 'CNAME') {
             printf ("  ~ '%s' is a CNAME for '%s' and will be resolved accordingly. \n",$rr->name,$rr->cname) if !($options{'q'});
-            $$logr .= sprintf("- CNAME resolved: %s -> %s\n",$rr->name,$rr->cname);
+            $$logr .= sprintf("CNAME resolved: %s -> %s\n",$rr->name,$rr->cname);
           }
           next;
         }
         $targets{$rr->address} = 0;
         $$logr .= sprintf("- %s\n",$rr->address);
       };
+      print_dns_result($domain,'A',$acount,undef,$logr);
     # no A record found either; log and fail
     } else {
       print_dns_result($domain,'A',undef,$resolver->errorstring,$logr);
@@ -611,23 +615,25 @@ The script itself.
 =head1 BUGS
 
 Please report any bugs or feature request to the author or use the
-bug tracker at L<https://code.virtcomm.de/thh/checkmail/issues>!
+bug tracker at L<http://bugs.th-h.de/>!
 
 =head1 SEE ALSO
 
-L<https://th-h.de/net/software/checkmail/> will have the current
+L<http://th-h.de/download/scripts.php> will have the current
 version of this program.
 
-This program is maintained using the Git version control system at
-L<https://code.virtcomm.de/thh/checkmail>.
+This program is maintained using the Git version control system. You
+may clone L<git://code.th-h.de/mail/checkmail.git> to check out the
+current development tree or browse it on the web via
+L<http://code.th-h.de/?p=mail/checkmail.git>.
 
 =head1 AUTHOR
 
-Thomas Hochstein <thh@thh.name>
+Thomas Hochstein <thh@inter.net>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2002-2016 Thomas Hochstein <thh@thh.name>
+Copyright (c) 2002-2010 Thomas Hochstein <thh@inter.net>
 
 This program is free software; you may redistribute it and/or modify it
 under the same terms as Perl itself.