- Moved all the bsd-* and fake-* stuff into new libopenbsd-compat.a

[openssh.git] / bsd-bindresvport.c

diff --git a/bsd-bindresvport.c b/bsd-bindresvport.c
index 0e91d26585cad68da46e350124487f3294f1f6a8..15bb667da50c43f8905f07076f07d13467afe463 100644 (file)
--- a/bsd-bindresvport.c
+++ b/bsd-bindresvport.c
@@ -61,6 +61,7 @@ bindresvport_af(sd, sa, af)
        struct sockaddr_in *sin;
        struct sockaddr_in6 *sin6;
        u_int16_t *portp;
+       u_int16_t port;
        int salen;
        int i;
 
@@ -83,21 +84,26 @@ bindresvport_af(sd, sa, af)
        }
        sa->sa_family = af;
 
-       if (*portp == 0)
-               *portp = (arc4random() % NPORTS) + STARTPORT;
+       port = ntohs(*portp);
+       if (port == 0)
+               port = (arc4random() % NPORTS) + STARTPORT;
 
        for(i = 0; i < NPORTS; i++) {
+               *portp = htons(port);
+               
                error = bind(sd, sa, salen);
-
+               
                /* Terminate on success */
                if (error == 0)
                        break;
                        
                /* Terminate on errors, except "address already in use" */
-               if ((error < 0) && ((errno != EADDRINUSE) || (errno != EINVAL)))
+               if ((error < 0) && !((errno == EADDRINUSE) || (errno == EINVAL)))
                        break;
                        
-               *portp = (i % NPORTS) + STARTPORT;
+               port++;
+               if (port > ENDPORT)
+                       port = STARTPORT;
        }
 
        return (error);