diff options
| author | Juergen Daubert <jue@jue.il> | 2015-11-02 08:49:54 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2015-11-02 08:55:04 -0500 |
| commit | 42536414deb28ba41079b9dc01be2834fd5d4a26 (patch) | |
| tree | 86703cbee83417647523a8afa41b81b022973e99 | |
| parent | 1ee2184248251ff44ae1ba557f12151cb8cf93ff (diff) | |
| download | nfs-utils-42536414deb28ba41079b9dc01be2834fd5d4a26.tar.gz nfs-utils-42536414deb28ba41079b9dc01be2834fd5d4a26.tar.xz nfs-utils-42536414deb28ba41079b9dc01be2834fd5d4a26.zip | |
nfsd: Fix message when creating NFSD listener sockets
When the kernel's IPv6 module isn't loaded:
rpc.nfsd: knfsd is currently down
rpc.nfsd: Writing version string to kernel: -2 +3 +4
rpc.nfsd: Creating AF_INET TCP socket.
rpc.nfsd: Creating AF_INET UDP socket.
rpc.nfsd: Creating AF_INET6 TCP socket.
rpc.nfsd: Creating AF_INET6 UDP socket.
The last two messages are misleading, since creation of AF_INET6
sockets now fails silently without kernel IPv6 support.
Fixes: c31fef7f4beb ('nfsd: ignore unsupported address types')
Signed-off-by: Juergen Daubert <jue@jue.il>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | utils/nfsd/nfssvc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c index fc11d23..e8efd06 100644 --- a/utils/nfsd/nfssvc.c +++ b/utils/nfsd/nfssvc.c @@ -168,8 +168,6 @@ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port) continue; } - xlog(D_GENERAL, "Creating %s %s socket.", family, proto); - /* open socket and prepare to hand it off to kernel */ sockfd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol); @@ -183,6 +181,9 @@ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port) addr = addr->ai_next; continue; } + + xlog(D_GENERAL, "Created %s %s socket.", family, proto); + #ifdef IPV6_SUPPORTED if (addr->ai_family == AF_INET6 && setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on))) { |