java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
New commits: commit 189e00810ff96835691e0552db333b5898806714 Author: Milan Zazrivec mzazrivec@redhat.com Date: Fri Dec 9 11:05:59 2011 +0100
IPv6: RHEL-5 registration may return "global" for an IPv6 address
diff --git a/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java b/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java index 18641d6..92b0a3c 100644 --- a/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java +++ b/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java @@ -225,7 +225,13 @@ public class NetworkInterface extends BaseDomainHelper implements * @return If available, returns a global IPv6 address. */ public String getIp6Addr() { - return findServerNetAddress6ByScope("universe"); + String address = findServerNetAddress6ByScope("universe"); + // RHEL-5 registration may return "global" rather than "universe" + // for global addresses (a libnl thing). + if (address == null) { + address = findServerNetAddress6ByScope("global"); + } + return address; }
/**
spacewalk-commits@lists.fedorahosted.org