diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2010-01-14 12:22:42 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2010-01-15 14:55:51 -0500 |
| commit | 86cfdf1d38da18f9f917c674daba79a4435445a7 (patch) | |
| tree | bc089e228b576779a15cece9d26a437cf8899300 | |
| parent | f867499c8521a957776d52a9657b15fa7c2a513f (diff) | |
| download | nfs-utils-86cfdf1d38da18f9f917c674daba79a4435445a7.tar.gz nfs-utils-86cfdf1d38da18f9f917c674daba79a4435445a7.tar.xz nfs-utils-86cfdf1d38da18f9f917c674daba79a4435445a7.zip | |
sm-notify: IPv6 support in reserved port binding in smn_create_socket()
This patch updates the "bind to an arbitrary privileged port" arm of
smn_create_socket() so it can deal with IPv6 bind addresses.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
| -rw-r--r-- | utils/statd/sm-notify.c | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c index 0ba817a..928d1c5 100644 --- a/utils/statd/sm-notify.c +++ b/utils/statd/sm-notify.c @@ -215,6 +215,26 @@ static int smn_socket(void) } #endif /* !IPV6_SUPPORTED */ +#ifdef HAVE_LIBTIRPC +static int +smn_bindresvport(int sock, struct sockaddr *sap) +{ + return bindresvport_sa(sock, sap); +} + +#else /* !HAVE_LIBTIRPC */ +static int +smn_bindresvport(int sock, struct sockaddr *sap) +{ + if (sap->sa_family != AF_INET) { + errno = EAFNOSUPPORT; + return -1; + } + + return bindresvport(sock, (struct sockaddr_in *)(char *)sap); +} +#endif /* !HAVE_LIBTIRPC */ + /* * Prepare a socket for sending RPC requests * @@ -265,7 +285,14 @@ retry: } else { struct servent *se; struct sockaddr_in *sin = (struct sockaddr_in *)local_addr; - (void) bindresvport(sock, sin); + + if (smn_bindresvport(sock, local_addr) == -1) { + xlog(L_ERROR, + "bindresvport on RPC socket failed: %m"); + (void)close(sock); + return -1; + } + /* try to avoid known ports */ se = getservbyport(sin->sin_port, "udp"); if (se && retry_cnt < 100) { |