From d8dedfb3b14e62984661bf65dae839b5fa93c7ff Mon Sep 17 00:00:00 2001
From: daniceexi <wxp@cn.ibm.com>
Date: Wed, 26 Feb 2014 13:26:01 -0500
Subject: [PATCH] defect 3961: make domain name keep without . at beginning

---
 xCAT-server/lib/xcat/plugins/ddns.pm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/ddns.pm b/xCAT-server/lib/xcat/plugins/ddns.pm
index ee048d0ad..3569b450d 100755
--- a/xCAT-server/lib/xcat/plugins/ddns.pm
+++ b/xCAT-server/lib/xcat/plugins/ddns.pm
@@ -389,7 +389,8 @@ sub process_request {
 			# - need domain for this node
 			my $host = $nodehash{$n}{host};
 			$domain=$nodedomains{$host};
-			unless ($domain =~ /^\./) { $domain = '.'.$domain; }
+			# remove the first . at domain name since it's not accepted by high dns parser
+			if ($domain =~ /^\./) { $domain =~ s/^\.//;; } 
 
             ($canonical,$aliasstr)  = split /[ \t]+/,$names,2;
             if ($aliasstr) {
@@ -403,13 +404,13 @@ sub process_request {
             xCAT::SvrUtils::sendmsg(":Handling $node in /etc/hosts.", $callback);
             
             unless ($canonical =~ /$domain/) {
-                $canonical.=$domain;
+                $canonical.=".".$domain;
             }
 			# for only the sake of comparison, ensure consistant dot suffix
             unless ($canonical =~ /\.\z/) { $canonical .= '.' }
             foreach my $alias (@aliases) {
                 unless ($alias =~ /$domain/) {
-                    $alias .= $domain;
+                    $alias .= ".".$domain;
                 }
                 unless ($alias =~ /\.\z/) {
                     $alias .= '.';
@@ -504,9 +505,11 @@ sub process_request {
         $ctx->{slaves}=\@slave_ips;
     }
 
+    $ctx->{domain} =~ s/^\.//; # remove . if it's the first char of domain name
     $ctx->{zonestotouch}->{$ctx->{domain}}=1;
 	foreach (@networks) {
 		if ($_->{domain}) {
+		    $_->{domain} =~ s/^\.//; # remove . if it's the first char of domain name
 			$ctx->{zonestotouch}->{$_->{domain}}=1;
 		}
 	}
@@ -792,11 +795,11 @@ sub update_zones {
 
     xCAT::SvrUtils::sendmsg("Updating zones.", $callback);
 
-    unless ($domain =~ /^\./) {
-        $domain = '.'.$domain;
+    if ($domain =~ /^\./) { # remove . if it's the first char of domain name
+        $domain =~ s/^\.//;
     }
     unless ($name =~ /\./) {
-        $name .= $domain;
+        $name .= ".".$domain;
     }
     unless ($name =~ /\.\z/) {
         $name .= '.';
@@ -1161,9 +1164,9 @@ sub add_or_delete_records {
         }
 
 		my $domain = $nodedomains{$node};
-		unless ($domain =~ /^\./) { $domain = '.'.$domain; }
+		if ($domain =~ /^\./) { $domain =~ s/^\.//; } # remove . if it's the first char of domain name
 
-        unless ($name =~ /$domain/) { $name .= $domain } # $name needs to represent fqdn, but must preserve $node as a nodename for cfg lookup
+        unless ($name =~ /$domain/) { $name .= ".".$domain } # $name needs to represent fqdn, but must preserve $node as a nodename for cfg lookup
 
         if ($ctx->{hoststab} and $ctx->{hoststab}->{$node} and $ctx->{hoststab}->{$node}->[0]->{ip}) {
             @ips = ($ctx->{hoststab}->{$node}->[0]->{ip});