X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fdomain_record.pm;h=f052f83ac9c94c5ed7a27e82f80ea54ffe8cb52b;hb=f441bdef352ddd432e305da35e80813ca30e517f;hp=2a30594da07e2a9677abb00202fa0ecc25ed54d1;hpb=f7fd2a3e34da751cbc02bbf215e99c6dc89adc15;p=freeside.git

diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 2a30594da..f052f83ac 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -10,7 +10,7 @@ use FS::svc_www;
 
 @ISA = qw(FS::Record);
 
-$DEBUG = 1;
+$DEBUG = 0;
 
 =head1 NAME
 
@@ -257,8 +257,8 @@ sub check {
   $self->recaf =~ /^(IN)$/ or return "Illegal recaf: ". $self->recaf;
   $self->recaf($1);
 
-  $self->rectype =~ /^(SOA|NS|MX|A|PTR|CNAME|_mstr)$/
-    or return "Illegal rectype (only SOA NS MX A PTR CNAME recognized): ".
+  $self->rectype =~ /^(SOA|NS|MX|A|PTR|CNAME|TXT|_mstr)$/
+    or return "Illegal rectype (only SOA NS MX A PTR CNAME TXT recognized): ".
               $self->rectype;
   $self->rectype($1);
 
@@ -291,6 +291,10 @@ sub check {
     $self->recdata =~ /^([a-z0-9\.\-]+|\@)$/i
       or return "Illegal data for CNAME record: ". $self->recdata;
     $self->recdata($1);
+  } elsif ( $self->rectype eq 'TXT' ) {
+    $self->recdata =~ /^((?:\S+)|(?:"[[:ascii:]]+"))$/
+      or return "Illegal data for TXT record: ". $self->recdata;
+    $self->recdata($1);
   } elsif ( $self->rectype eq '_mstr' ) {
     $self->recdata =~ /^((\d{1,3}\.){3}\d{1,3})$/
       or return "Illegal data for _master pseudo-record: ". $self->recdata;