rpc.nfsd: Do not fail when all address families are not support.
Subsystems (2)
PATCH 1/1 rpc.nfsd: Do not fail when all address families are not support.
Commit 2f8a6020 introduce a regression causing rpc.nfsd to fail when IPv6 is not supported. rpc.nfsd should not fail when there is at least one bounded socket.
Signed-off-by Steve Dickson <[email protected]>
--- utils/nfsd/nfssvc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
utils/nfsd/nfssvc.c +4 -2
@@ -112,7 +112,7 @@ static int nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port) { int fd, on = 1, fac = L_ERROR; -int sockfd =-1 , rc =0 ; +int sockfd =-1 , rc =0 , bounded =0 ;struct addrinfo *addrhead =NULL , *addr;char *proto, *family;
@@ -233,6 +233,8 @@ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port) rc = errno; goto error; } + bounded++; +close (fd);close (sockfd); sockfd = fd =-1 ;
@@ -245,7 +247,7 @@ error:close (sockfd);if (addrhead)freeaddrinfo (addrhead); -return rc; +return (bounded ?0 : rc); }int
Signature · 1 line
2.13.5
Quoted 5 lines · Steve Dickson
Commit
2f8a6020introduce a regression causing rpc.nfsd to fail when IPv6 is not supported. rpc.nfsd should not fail when there is at least one bounded socket.Signed-off-by Steve Dickson <[email protected]>
Committed....
steved.
Quoted 36 lines
--- utils/nfsd/nfssvc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)utils/nfsd/nfssvc.c +4
-2@@ -112,7 +112,7 @@ static int nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port) { int fd, on = 1, fac = L_ERROR; -int sockfd =-1 , rc =0 ; +int sockfd =-1 , rc =0 , bounded =0 ;struct addrinfo *addrhead =NULL , *addr;char *proto, *family;@@ -233,6 +233,8 @@ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port) rc = errno; goto error; } + bounded++; +close (fd);close (sockfd); sockfd = fd =-1 ;@@ -245,7 +247,7 @@ error:close (sockfd);if (addrhead)freeaddrinfo (addrhead); -return rc; +return (bounded ?0 : rc); }int