ispman/lib/ISPMan DNSMan.pm,1.32,1.33

Update of /cvsroot/ispman/ispman/lib/ISPMan
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30208/lib/ISPMan

Modified Files:
	DNSMan.pm 
Log Message:
added TXT record support

Index: DNSMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/DNSMan.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- DNSMan.pm	20 Jun 2004 09:11:55 -0000	1.32
+++ DNSMan.pm	6 Jun 2006 20:55:57 -0000	1.33
@@ -51,6 +51,9 @@
 use ISPMan::DNSMan::CNAMES;
 push @EXPORT, @ISPMan::DNSMan::CNAMES::EXPORT;
 
+use ISPMan::DNSMan::TXTrecords;
+push @EXPORT, @ISPMan::DNSMan::TXTrecords::EXPORT;
+
 use ISPMan::DNSMan::LDIFUtils;
 push @EXPORT, @ISPMan::DNSMan::LDIFUtils::EXPORT;
 
@@ -76,6 +79,9 @@
   getnSRecordDn
   getnSRecordBranchDn
 
+  gettXTRecordDn
+  gettXTRecordBranchDn
+
   getsOARecordDn
   getDNSDN
 );
@@ -95,38 +101,38 @@
     return "ou=sOARecord," . $self->getDNSDN($domain);
 }
 
-sub getmXRecordDn {
+sub getcNAMERecordDn {
     my $self = shift;
-    my ( $domain, $origion, $pref, $host ) = @_;
+    my ( $domain, $host, $alias ) = @_;
     return join ",",
       (
-        "relativeDomainName=$origion",
-        $self->getmXRecordBranchDn( $domain, $pref, $host )
+        "relativeDomainName=$alias",
+        $self->getcNAMERecordBranchDn( $domain, $host )
       );
 }
 
-sub getmXRecordBranchDn {
+sub getcNAMERecordBranchDn {
     my $self = shift;
-    my ( $domain, $pref, $host ) = @_;
+    my ( $domain, $host ) = @_;
     return join ",",
-      ( "mXRecord=$pref $host, ou=mXRecord", $self->getDNSDN($domain) );
+      ( "cNAMERecord=$host, ou=cNAMERecord", $self->getDNSDN($domain) );
 }
 
-sub getcNAMERecordDn {
+sub getmXRecordDn {
     my $self = shift;
-    my ( $domain, $host, $alias ) = @_;
+    my ( $domain, $origion, $pref, $host ) = @_;
     return join ",",
       (
-        "relativeDomainName=$alias",
-        $self->getcNAMERecordBranchDn( $domain, $host )
+        "relativeDomainName=$origion",
+        $self->getmXRecordBranchDn( $domain, $pref, $host )
       );
 }
 
-sub getcNAMERecordBranchDn {
+sub getmXRecordBranchDn {
     my $self = shift;
-    my ( $domain, $host ) = @_;
+    my ( $domain, $pref, $host ) = @_;
     return join ",",
-      ( "cNAMERecord=$host, ou=cNAMERecord", $self->getDNSDN($domain) );
+      ( "mXRecord=$pref $host, ou=mXRecord", $self->getDNSDN($domain) );
 }
 
 sub getARecordDn {
@@ -159,6 +165,21 @@
       ( "nsRecord=$host, ou=nsRecord", $self->getDNSDN($domain) );
 }
 
+sub gettXTRecordDn {
+    my $self = shift;
+    my ( $domain, $host, $txt ) = @_;
+    return join ",",
+      ( "relativeDomainName=$host", $self->gettXTRecordBranchDn( $domain, $txt ) );
+}
+
+sub gettXTRecordBranchDn {
+    my $self = shift;
+    my ( $domain, $txt ) = @_;
+    return join ",",
+      ( "tXTRecord=$txt, ou=tXTRecord", $self->getDNSDN($domain) );
+}
+
+
 sub newDNSRecord {
     my $self = shift;
     my ( $domain, $recordType, $relativeDomainName, $record, $extraHash ) = @_;