Improved textual error string for _s_prohibitedcname.

diff --git a/regress/case-brokenmail.out b/regress/case-brokenmail.out
index d40908de459ca03d08b8c50a343d95411dae3f4a..f2b7d19e9c1dd89526a216f367a57c5a3f046224 100644 (file)
--- a/regress/case-brokenmail.out
+++ b/regress/case-brokenmail.out
@@ -24,7 +24,7 @@ broken-mail.test.iwj.relativity.greenend.org.uk. flags 0 type MX(+addr): OK; nrr
  10 manyaddrs.test.iwj.relativity.greenend.org.uk ok "OK" ( INET 127.0.0.1 INET 172.18.45.6 INET 172.18.45.1 INET 172.18.45.35 )
  20 host.broken-delg.test.iwj.relativity.greenend.org.uk timeout "DNS query timed out" ?
  30 172.18.45.36 nxdomain "No such domain" ( )
  10 manyaddrs.test.iwj.relativity.greenend.org.uk ok "OK" ( INET 127.0.0.1 INET 172.18.45.6 INET 172.18.45.1 INET 172.18.45.35 )
  20 host.broken-delg.test.iwj.relativity.greenend.org.uk timeout "DNS query timed out" ?
  30 172.18.45.36 nxdomain "No such domain" ( )

- 40 cname-ptr.test.iwj.relativity.greenend.org.uk prohibitedcname "DNS data refers to an alias" ( )
+ 40 cname-ptr.test.iwj.relativity.greenend.org.uk prohibitedcname "DNS alias found where canonical name wanted" ( )

 broken-mail.test.iwj.relativity.greenend.org.uk. flags 256 type MX(+addr): OK; nrrs=4; cname=$; owner=$; ttl=30
  10 manyaddrs.test.iwj.relativity.greenend.org.uk ok "OK" ( INET 127.0.0.1 INET 172.18.45.6 INET 172.18.45.1 INET 172.18.45.35 )
  20 host.broken-delg.test.iwj.relativity.greenend.org.uk timeout "DNS query timed out" ?
 broken-mail.test.iwj.relativity.greenend.org.uk. flags 256 type MX(+addr): OK; nrrs=4; cname=$; owner=$; ttl=30
  10 manyaddrs.test.iwj.relativity.greenend.org.uk ok "OK" ( INET 127.0.0.1 INET 172.18.45.6 INET 172.18.45.1 INET 172.18.45.35 )
  20 host.broken-delg.test.iwj.relativity.greenend.org.uk timeout "DNS query timed out" ?

diff --git a/src/general.c b/src/general.c
index a54c4395232245673dcaeb82a99c2481da7d9d46..00a1ae808f2d7ef23d3ba4faf1ba693efb9ac76e 100644 (file)
--- a/src/general.c
+++ b/src/general.c
@@ -225,7 +225,7 @@ static const struct sinfo {
   SINFO(  rcodeunknown,        "Nameserver sent unknown response code"         ),
   
   SINFO(  inconsistent,        "Inconsistent resource records in DNS"          ),
   SINFO(  rcodeunknown,        "Nameserver sent unknown response code"         ),
   
   SINFO(  inconsistent,        "Inconsistent resource records in DNS"          ),

-  SINFO(  prohibitedcname,     "DNS data refers to an alias"                   ),
+  SINFO(  prohibitedcname,     "DNS alias found where canonical name wanted"   ),

   SINFO(  answerdomaininvalid, "Found syntactically invalid domain name"       ),
   SINFO(  answerdomaintoolong, "Found overly-long domain name"                 ),
   SINFO(  invaliddata,         "Found invalid DNS data"                        ),
   SINFO(  answerdomaininvalid, "Found syntactically invalid domain name"       ),
   SINFO(  answerdomaintoolong, "Found overly-long domain name"                 ),
   SINFO(  invaliddata,         "Found invalid DNS data"                        ),