aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2016-05-29 20:28:01 +0000
committerEnji Cooper <ngie@FreeBSD.org>2016-05-29 20:28:01 +0000
commit98a7b0ba5cc5ef67a9f1bb8cef8dce6974219464 (patch)
tree8dd03de9b26162b16990a59c049e98e614fb803e /usr.sbin
parent5656b5057ebe86bf0bfdffca3281de2cb5b224c4 (diff)
downloadsrc-98a7b0ba5cc5ef67a9f1bb8cef8dce6974219464.tar.gz
src-98a7b0ba5cc5ef67a9f1bb8cef8dce6974219464.zip
Follow up to r300932
In the event MK_INET6 != no in userspace, but is disabled in the kernel, or if there aren't any IPv6 addresses configured in userspace (for lo0 and all physical interfaces), rpcbind would terminate immediately instead of silently failing on Skip over the IPv6 block to its respective cleanup with freeifaddrs if creating the socket failed instead of terminating rpcbind immediately MFC after: 6 days X-MFC with: r300932 Reported by: O. Hartmann <ohartman@zedat.fu-berlin.de> Sponsored by: EMC / Isilon Storage Division
Notes
Notes: svn path=/head/; revision=300973
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/rpcbind/util.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/rpcbind/util.c b/usr.sbin/rpcbind/util.c
index 7ada37645798..1539b186bc00 100644
--- a/usr.sbin/rpcbind/util.c
+++ b/usr.sbin/rpcbind/util.c
@@ -371,7 +371,7 @@ network_init(void)
if (s == -1) {
if (debugging)
fprintf(stderr, "couldn't create ip6 socket");
- exit(1);
+ goto done_inet6;
}
/*
@@ -394,6 +394,7 @@ network_init(void)
if (debugging)
perror("setsockopt v6 multicast");
}
+done_inet6:
freeifaddrs(ifp);
#endif