summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Hagen <kim.sidney@gmail.com>2016-02-24 07:16:38 -0500
committerKim Hagen <kim.sidney@gmail.com>2016-02-24 07:16:38 -0500
commitf1e9b5e675d5e8f7b4309fb4c1df509817b3387a (patch)
tree26bfda56e45c611a0dd06a969f7ddd753e32c7eb
parent8916fa69bdd7db82f8b4f669903fe2ab36b21e5b (diff)
downloadvyatta-cfg-f1e9b5e675d5e8f7b4309fb4c1df509817b3387a.tar.gz
vyatta-cfg-f1e9b5e675d5e8f7b4309fb4c1df509817b3387a.zip
Fix "Subroutine Vyatta::Misc::sockaddr_in6 redefined at" message.
-rwxr-xr-xlib/Vyatta/Misc.pm2
-rw-r--r--lib/Vyatta/ioctl.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Vyatta/Misc.pm b/lib/Vyatta/Misc.pm
index 59aff2b..7d47b3c 100755
--- a/lib/Vyatta/Misc.pm
+++ b/lib/Vyatta/Misc.pm
@@ -40,7 +40,7 @@ use Vyatta::Config;
use Vyatta::Interface;
use NetAddr::IP;
use Socket;
-use Socket6;
+Socket6->import(qw(inet_pton getaddrinfo));
#
# returns a hash of ipaddrs => interface
diff --git a/lib/Vyatta/ioctl.pm b/lib/Vyatta/ioctl.pm
index 7c745c3..6572231 100644
--- a/lib/Vyatta/ioctl.pm
+++ b/lib/Vyatta/ioctl.pm
@@ -22,7 +22,7 @@ package Vyatta::ioctl;
use strict;
use warnings;
use Socket;
-use Socket6;
+Socket6->import(qw(inet_pton getaddrinfo));
{
local $^W = 0;