xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-14 10:20:31 +00:00
Code Issues Releases Wiki Activity

ddns.pm: fix condition to append domainname to hostname

Browse Source 
Fix an issue where the domainname was not appended to the hostname
when the domainname was contained in a substring of the hostname.
Update the regular expression to make sure it only check for the
domainname at the end of the hostname string.
This commit is contained in:
Kilian Cavalotti
2016-11-08 15:27:45 -08:00
parent d1ca54598d
commit fd90ff371b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-server/lib/xcat/plugins/ddns.pm
View File

@ -493,7 +493,7 @@ sub process_request {
# for only the sake of comparison, ensure consistant dot suffix
unless ($canonical =~ /\.\z/) { $canonical .= '.' }
foreach my $alias (@aliases) {
unless ($alias =~ /$domain/) {
unless ($alias =~ /\.$domain\z/) {
$alias .= "." . $domain;
}
unless ($alias =~ /\.\z/) {
@ -1417,7 +1417,7 @@ sub add_or_delete_records {
my $domain = $nodedomains{$node};
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\z/) { $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});