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

ipv6 fix, replace the Socket library calls with NetworkUtils subroutines

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6039 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc 2010-05-10 08:43:37 +00:00
parent dd0e3f7f35
commit 7747bf92cb
1 changed files with 19 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
xCAT-server/lib/xcat/plugins/makeknownhosts.pm
View File

@ -239,29 +239,20 @@ sub add_known_host
return 1;
}
chop($output[0]);
my $ip_address = "";
if (($hostname, $aliases, $addrtype, $length, @addrs) =
gethostbyname($node))
my ($hostname,$ip_address) = xCAT::NetworkUtils->gethostnameandip($node);
if (!$hostname || !$ip_address)
{
foreach my $ipaddr (@addrs)
{
$ip_address .= inet_ntoa($ipaddr);
$ip_address .= ",";
}
my $rsp = {};
$rsp->{data}->[0] = "Can not resolve $node";
xCAT::MsgUtils->message("E", $rsp, $callback, 1);
return 1;
}
chop($ip_address);
my @newaliaslist = split (/ /,$aliases);
my $aliaslist="";
foreach my $entry (@newaliaslist) {
$aliaslist .= "$entry,";
}
if (defined $hostname)
{
$line = "\"";
$line .= "$hostname,";
$line .= "$aliaslist";
$line .= "$ip_address";
$line .= " ";
$line .= $output[0];
@ -317,7 +308,7 @@ sub remove_nodes_from_knownhosts
my @all_names;
my ($hostname, $aliases, $addrtype, $length, @addrs);
my ($hostname, $ipaddr);
# Put all the possible knownhosts entries
# for the nodes into @all_names
@ -327,30 +318,20 @@ sub remove_nodes_from_knownhosts
{
push @all_names, $node;
}
if (($hostname, $aliases, $addrtype, $length, @addrs) =
gethostbyname($node))
($hostname, $ipaddr) = xCAT::NetworkUtils->gethostnameandip($node);
if (!$hostname || !$ipaddr)
{
if (!grep(/^$hostname$/, @all_names))
{
push @all_names, $hostname;
}
foreach my $ipaddr (@addrs)
{
my $realip = inet_ntoa($ipaddr);
if (!grep(/^$realip$/, @all_names))
{
push @all_names, $realip;
}
}
my @newaliaslist = split (/ /,$aliases);
foreach my $entry (@newaliaslist) {
if (!grep(/^$entry$/, @all_names))
{
push @all_names, $entry;
}
}
return 0;
}
if (!grep(/^$hostname$/, @all_names))
{
push @all_names, $hostname;
}
if (!grep(/^$ipaddr$/, @all_names))
{
push @all_names, $ipaddr;
}
}
#create the sed command