From ebb3f27e55e1221a59b80a9e6439fa98c18d79be Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 8 Mar 2012 15:17:20 +0000
Subject: [PATCH] Rework some of the IPv6 logic to tolerate certain peculiar
 perl environments

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11797 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/perl/xCAT/IPMI.pm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/IPMI.pm b/xCAT-server/lib/perl/xCAT/IPMI.pm
index 2055eafa7..140d08e8e 100644
--- a/xCAT-server/lib/perl/xCAT/IPMI.pm
+++ b/xCAT-server/lib/perl/xCAT/IPMI.pm
@@ -17,10 +17,9 @@ use warnings "all";
 use IO::Socket::INET qw/!AF_INET6 !PF_INET6/;
 
 my $doipv6=eval {
+	require Socket6;
 	require IO::Socket::INET6; 
 	IO::Socket::INET6->import();
-	require Socket6;
-        Socket6->import();
 	1;
 };
 use IO::Select;
@@ -111,7 +110,7 @@ sub new {
     my ($family, $socktype, $protocol, $saddr, $name, $ip, $service);
     if ($doipv6) {
        ($family, $socktype, $protocol, $saddr, $name) = Socket6::getaddrinfo($self->{bmc},623,AF_UNSPEC,SOCK_DGRAM,0);
-       ($ip,$service) = getnameinfo($saddr,Socket6::NI_NUMERICHOST());
+       ($ip,$service) = Socket6::getnameinfo($saddr,Socket6::NI_NUMERICHOST());
     }
     unless ($saddr or $bmc_n = inet_aton($self->{bmc})) {
         $self->{error} = "Could not resolve ".$self->{bmc}." to an address";
@@ -424,7 +423,7 @@ sub route_ipmiresponse {
     #($port,$host) = sockaddr_in6($sockaddr);
     #$host = inet_ntoa($host);
     if ($doipv6) {
-	    ($host,$port) = getnameinfo($sockaddr,Socket6::NI_NUMERICHOST());
+	    ($host,$port) = Socket6::getnameinfo($sockaddr,Socket6::NI_NUMERICHOST());
     } else {
 	($port,$host) = sockaddr_in($sockaddr);
 	$host = inet_ntoa($host);