X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_domain.pm;h=bdaf79b2f2a47024481f457c06b2e3e3fac9b477;hb=97316d268e5751a1d08a0a37e5a0456f2ce4815c;hp=2642146ea9397be69e27ce506a599bf9bed1701e;hpb=08feb6698a96eed199404b8319a39ec4c02a084e;p=freeside.git

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 2642146ea..bdaf79b2f 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -230,7 +230,11 @@ sub delete {
     my $error = $domain_record->delete;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-      return $error;
+      return "can't delete DNS entry: ".
+             join(' ', map $domain_record->$_(),
+                           qw( reczone recaf rectype recdata )
+                 ).
+             ":$error";
     }
   }
 
@@ -364,11 +368,13 @@ sub domain_record {
   my $self = shift;
 
   my %order = (
-    SOA => 1,
-    NS => 2,
-    MX => 3,
-    CNAME => 4,
-    A => 5,
+    'SOA'   => 1,
+    'NS'    => 2,
+    'MX'    => 3,
+    'CNAME' => 4,
+    'A'     => 5,
+    'TXT'   => 6,
+    'PTR'   => 7,
   );
 
   sort { $order{$a->rectype} <=> $order{$b->rectype} }