arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-Skip putting ddns update zones in dhcp.pm if dnshandler not set to ddns

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8829 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2011-02-11 18:06:26 +00:00
parent 34d4ebe5e5
commit fe2a9d9eaa
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1396,6 +1396,7 @@ sub addnet6
}
my $ddnserver = $nameservers;
$ddnserver =~ s/,.*//;
if ($::XCATSITEVALS{dnshandler} =~ /ddns/) {
push @netent, " zone $domain. {\n";
push @netent, " primary $ddnserver; key xcat_key; \n";
push @netent, " }\n";
@ -1404,6 +1405,7 @@ sub addnet6
push @netent, " primary $ddnserver; key xcat_key; \n";
push @netent, " }\n";
}
}
if ($netcfgs{$net}->{range}) {
push @netent," range6 ".$netcfgs{$net}->{range}.";\n";
} else {
@ -1610,6 +1612,7 @@ sub addnet
}
my $ddnserver = $nameservers;
$ddnserver =~ s/,.*//;
if ($::XCATSITEVALS{dnshandler} =~ /ddns/) {
push @netent, "zone $domain. {\n";
push @netent, " primary $ddnserver; key xcat_key; \n";
push @netent, " }\n";
@ -1618,6 +1621,7 @@ sub addnet
push @netent, " primary $ddnserver; key xcat_key; \n";
push @netent, " }\n";
}
}
my $tmpmaskn = unpack("N", inet_aton($mask));
my $maskbits = 32;