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

changes for multi-domain support

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14228 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott 2012-11-02 13:57:28 +00:00
parent 915492b44a
commit e352c14b74
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xCAT-server/sbin/xcatd
View File

@ -308,11 +308,12 @@ if ($inet6support) {
my $validclient=0;
my $node;
my $domain;
my ($tmp) = $sitetab->getAttribs({'key'=>'domain'},'value');
if (defined $tmp->{value}) {
$domain = $tmp->{value};
}
my $nd = xCAT::NetworkUtils->getNodeDomains(\@clients);
my %nodedomains = %{$nd};
foreach my $client (@clients) {
$domain = $nodedomains{$client};
$client =~ s/\..*//;
if ($domain) {
$client =~ s/\.$domain//;
@ -967,18 +968,23 @@ until ($quit) {
$peername=undef;
}
populate_site_hash();
$domain = $::XCATSITEVALS{domain};
if ($inet6support) {
$peerhost = gethostbyaddr($connection->peeraddr,AF_INET6);
} else {
$peerhost = gethostbyaddr($connection->peeraddr,AF_INET);
}
unless ($peerhost) { $peerhost = gethostbyaddr($connection->peeraddr,AF_INET); }
$peerfqdn=$peerhost;
my $peerhostorg=$peerhost; # save original with domain for validation
my @hosts;
push (@hosts, $peerhost);
my $nd = xCAT::NetworkUtils->getNodeDomains(\@hosts);
my %nodedomains = %$nd;
$domain = $nodedomains{$peerhost};
if ($domain) {
# strip off domain if set
$peerhost && $peerhost =~ s/\.$domain\.*$//;