ispman/lib/ISPMan/DNSMan SOArecords.pm, 1.24, 1.24.2.1 TXTrecords.pm, 1.3, 1.3.2.1

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

Modified Files:
      Tag: dev_1_3-cyrus_virtdomain
	SOArecords.pm TXTrecords.pm 
Log Message:
Branch is now "aparently" updated to HEAD, though debuging is needed.


Index: TXTrecords.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/DNSMan/TXTrecords.pm,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- TXTrecords.pm	6 Jun 2006 22:12:04 -0000	1.3
+++ TXTrecords.pm	11 Sep 2006 23:31:27 -0000	1.3.2.1
@@ -45,16 +45,12 @@
     my $self               = shift;
     my $domain             = shift;
     my $relativeDomainName = shift;
-    my $filter;
+    my $filter = "&(objectclass=dnsZone)(txtRecord=*)";
     if ($relativeDomainName) {
-        $filter = "&(objectclass=dnsZone)".
-        "(txtRecord=*)".
-        "(relativeDomainName=$relativeDomainName)";
-    }
-    else {
-        $filter = "&(objectclass=dnsZone)(txtRecord=*)";
+        $filter .= "(relativeDomainName=$relativeDomainName)";
     }
-    my $dn = $self->getDNSDN($domain);
+    
+    my $dn = "ou=txtRecord,".$self->getDNSDN($domain);
 
     my $h =
       $self->getEntriesAsHashRef( $dn, $filter,

Index: SOArecords.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/DNSMan/SOArecords.pm,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -d -r1.24 -r1.24.2.1
--- SOArecords.pm	6 Jun 2006 10:08:49 -0000	1.24
+++ SOArecords.pm	11 Sep 2006 23:31:27 -0000	1.24.2.1
@@ -40,7 +40,7 @@
     my $r    = shift;
     my $soa  = $self->getSOA( $r->param('ispmanDomain') );
 
-    foreach ( ('primary','rootmail','serial','refresh','retry','expire','minimum') ){
+    foreach ( ('primary','rootmail','refresh','retry','expire','minimum') ){
         $soa->{$_} = $r->param($_);
     }
     $self->setDNSsOARecord( $r->param("ispmanDomain"), $soa );


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642