Changeset 11206

Timestamp:

08/15/08 11:44:32 (5 months ago)

Author:

/C=ES/O=Warp Networks S.L./CN=juruen@…

Message:

Merging r11205 from trunk into intrepid branches

Location:

branches/juruen

Files:

• intrepid-alpha4/client/dns/src/EBox/DNS.pm.in (modified) (1 diff)
• intrepid-packages/client/dns/src/EBox/DNS.pm.in (modified) (1 diff)

branches/juruen/intrepid-alpha4/client/dns/src/EBox/DNS.pm.in

@@ -299 +299 @@
     my ($self, $mailExchangers) = @_;
 
+    my $hostnames = 
     my @mailExchangers;
     foreach my $mx (@{$mailExchangers}) {
         my $hostName = $mx->valueByName('hostName');
-        if ($mx->elementByName('hostName')->value() eq 'custom') {
+        if ($mx->elementByName('hostName')->selectedType() eq 'custom') {
             unless ( $hostName =~ m:\.$: ) {
                 $hostName .= '.';
             }
+        } else {
+            $hostName = $mx->parentRow()
+               ->subModel('hostnames')
+               ->row($hostName)
+               ->valueByName('hostname');
         }
         push (@mailExchangers, { 

branches/juruen/intrepid-packages/client/dns/src/EBox/DNS.pm.in

@@ -299 +299 @@
     my ($self, $mailExchangers) = @_;
 
+    my $hostnames = 
     my @mailExchangers;
     foreach my $mx (@{$mailExchangers}) {
         my $hostName = $mx->valueByName('hostName');
-        if ($mx->elementByName('hostName')->value() eq 'custom') {
+        if ($mx->elementByName('hostName')->selectedType() eq 'custom') {
             unless ( $hostName =~ m:\.$: ) {
                 $hostName .= '.';
             }
+        } else {
+            $hostName = $mx->parentRow()
+               ->subModel('hostnames')
+               ->row($hostName)
+               ->valueByName('hostname');
         }
         push (@mailExchangers, {