diff options
| author | alfred <alfred@FreeBSD.org> | 2001-03-25 19:57:58 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2001-03-25 19:57:58 +0000 |
| commit | 57d69411fce6e28baee6f833c31098e8b9f6b550 (patch) | |
| tree | 7bc3c6c954d42e2ec8ce40c703534837ae4087e9 | |
| parent | f6ff30b00b102be9350141bd0aaa57669db57a87 (diff) | |
| download | FreeBSD-src-57d69411fce6e28baee6f833c31098e8b9f6b550.zip FreeBSD-src-57d69411fce6e28baee6f833c31098e8b9f6b550.tar.gz | |
Deal with lack of IPv6 support gracefully.
Submitted by: Martin Blapp <mb@imp.ch>
| -rw-r--r-- | sbin/mountd/mountd.c | 12 | ||||
| -rw-r--r-- | usr.sbin/mountd/mountd.c | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c index b527765..9c5dc97 100644 --- a/sbin/mountd/mountd.c +++ b/sbin/mountd/mountd.c @@ -352,6 +352,10 @@ main(argc, argv) rpcb_unset(RPCPROG_MNT, RPCMNT_VER3, NULL); udpsock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); tcpsock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + udpconf = getnetconfigent("udp"); + tcpconf = getnetconfigent("tcp"); + if (!have_v6) + goto skip_v6; udp6sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); tcp6sock = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); /* @@ -369,10 +373,10 @@ main(argc, argv) syslog(LOG_ERR, "can't disable v4-in-v6 on UDP socket"); exit(1); } - udpconf = getnetconfigent("udp"); - tcpconf = getnetconfigent("tcp"); udp6conf = getnetconfigent("udp6"); tcp6conf = getnetconfigent("tcp6"); + +skip_v6: if (!resvport_only) { mib[0] = CTL_VFS; mib[1] = vfc.vfc_typenum; @@ -429,7 +433,7 @@ main(argc, argv) syslog(LOG_WARNING, "can't create TCP service"); } - if (udp6sock != -1 && udp6conf != NULL) { + if (have_v6 && udp6sock != -1 && udp6conf != NULL) { bindresvport(udp6sock, NULL); udp6transp = svc_dg_create(udp6sock, 0, 0); if (udp6transp != NULL) { @@ -449,7 +453,7 @@ main(argc, argv) syslog(LOG_WARNING, "can't create UDP6 service"); } - if (tcp6sock != -1 && tcp6conf != NULL) { + if (have_v6 && tcp6sock != -1 && tcp6conf != NULL) { bindresvport(tcp6sock, NULL); listen(tcp6sock, SOMAXCONN); tcp6transp = svc_vc_create(tcp6sock, 0, 0); diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index b527765..9c5dc97 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -352,6 +352,10 @@ main(argc, argv) rpcb_unset(RPCPROG_MNT, RPCMNT_VER3, NULL); udpsock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); tcpsock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + udpconf = getnetconfigent("udp"); + tcpconf = getnetconfigent("tcp"); + if (!have_v6) + goto skip_v6; udp6sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); tcp6sock = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); /* @@ -369,10 +373,10 @@ main(argc, argv) syslog(LOG_ERR, "can't disable v4-in-v6 on UDP socket"); exit(1); } - udpconf = getnetconfigent("udp"); - tcpconf = getnetconfigent("tcp"); udp6conf = getnetconfigent("udp6"); tcp6conf = getnetconfigent("tcp6"); + +skip_v6: if (!resvport_only) { mib[0] = CTL_VFS; mib[1] = vfc.vfc_typenum; @@ -429,7 +433,7 @@ main(argc, argv) syslog(LOG_WARNING, "can't create TCP service"); } - if (udp6sock != -1 && udp6conf != NULL) { + if (have_v6 && udp6sock != -1 && udp6conf != NULL) { bindresvport(udp6sock, NULL); udp6transp = svc_dg_create(udp6sock, 0, 0); if (udp6transp != NULL) { @@ -449,7 +453,7 @@ main(argc, argv) syslog(LOG_WARNING, "can't create UDP6 service"); } - if (tcp6sock != -1 && tcp6conf != NULL) { + if (have_v6 && tcp6sock != -1 && tcp6conf != NULL) { bindresvport(tcp6sock, NULL); listen(tcp6sock, SOMAXCONN); tcp6transp = svc_vc_create(tcp6sock, 0, 0); |
