tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fix rresvport_af failure errors (logic error in bsd-bindresvport.c)

This commit is contained in:
Damien Miller 2000-01-17 15:23:01 +11:00
parent e219273f93
commit 19fe9c7fd8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -6,9 +6,11 @@
- Document location of Redhat PAM file in INSTALL. - Document location of Redhat PAM file in INSTALL.
- Fixed X11 forwarding bug on Linux. libc advertises AF_INET6 - Fixed X11 forwarding bug on Linux. libc advertises AF_INET6
INADDR_ANY_INIT addresses via getaddrinfo, but may not be able to INADDR_ANY_INIT addresses via getaddrinfo, but may not be able to
deliver (no IPv6 kernel kernel support) deliver (no IPv6 kernel support)
- Released 1.2.1pre27 - Released 1.2.1pre27
- Fix rresvport_af failure errors (logic error in bsd-bindresvport.c)
20000116 20000116
- Renamed --with-xauth-path to --with-xauth - Renamed --with-xauth-path to --with-xauth
- Added --with-pid-dir option - Added --with-pid-dir option

6
bsd-bindresvport.c
View File

@ -84,17 +84,17 @@ bindresvport_af(sd, sa, af)
sa->sa_family = af; sa->sa_family = af;
if (*portp == 0) if (*portp == 0)
*portp = (arc4random() % NPORTS) + STARTPORT; *portp = (u_int16_t)(arc4random() % NPORTS) + STARTPORT;
for(i = 0; i < NPORTS; i++) { for(i = 0; i < NPORTS; i++) {
error = bind(sd, sa, salen); error = bind(sd, sa, salen);
/* Terminate on success */ /* Terminate on success */
if (error == 0) if (error == 0)
break; break;
/* Terminate on errors, except "address already in use" */ /* Terminate on errors, except "address already in use" */
if ((error < 0) && ((errno != EADDRINUSE) || (errno != EINVAL))) if ((error < 0) && !((errno == EADDRINUSE) || (errno == EINVAL)))
break; break;
*portp = (i % NPORTS) + STARTPORT; *portp = (i % NPORTS) + STARTPORT;