diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sunrpc/bindrsvprt.c | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 079bfe5fe8..212e21874c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-05-23 Ulrich Drepper <drepper@redhat.com> + + * sunrpc/bindrsvprt.c (LOWPORT): Apparently some mountd + implementations are broken and don't accept ports < 512. + 2005-05-22 Dmitry V. Levin <ldv@altlinux.org> [BZ #961] diff --git a/sunrpc/bindrsvprt.c b/sunrpc/bindrsvprt.c index 671f229aae..f58d3b2a8b 100644 --- a/sunrpc/bindrsvprt.c +++ b/sunrpc/bindrsvprt.c @@ -43,13 +43,12 @@ int bindresvport (int sd, struct sockaddr_in *sin) { - int res; static short port; struct sockaddr_in myaddr; int i; #define STARTPORT 600 -#define LOWPORT 200 +#define LOWPORT 512 #define ENDPORT (IPPORT_RESERVED - 1) #define NPORTS (ENDPORT - STARTPORT + 1) static short startport = STARTPORT; @@ -70,12 +69,13 @@ bindresvport (int sd, struct sockaddr_in *sin) { port = (__getpid () % NPORTS) + STARTPORT; } - res = -1; - __set_errno (EADDRINUSE); + + /* Initialize to make gcc happy. */ + int res = -1; int nports = ENDPORT - startport + 1; again: - for (i = 0; i < nports && res < 0 && errno == EADDRINUSE; ++i) + for (i = 0; i < nports; ++i) { sin->sin_port = htons (port++); if (port > ENDPORT) @@ -83,6 +83,8 @@ bindresvport (int sd, struct sockaddr_in *sin) port = startport; } res = __bind (sd, sin, sizeof (struct sockaddr_in)); + if (res >= 0 || errno != EADDRINUSE) + break; } if (i == nports && startport != LOWPORT) |