diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | openbsd-compat/bindresvport.c | 12 |
2 files changed, 10 insertions, 7 deletions
@@ -15,6 +15,9 @@ | |||
15 | increase number of piplelined requests so they properly fill the | 15 | increase number of piplelined requests so they properly fill the |
16 | (recently increased) channel window. prompted by rapier AT psc.edu; | 16 | (recently increased) channel window. prompted by rapier AT psc.edu; |
17 | ok markus@ | 17 | ok markus@ |
18 | - (djm) [openbsd-compat/bindresvport.c] Rename variables s/sin/in/ to | ||
19 | avoid clash with sin(3) function; reported by | ||
20 | cristian.ionescu-idbohrn AT axis.com | ||
18 | 21 | ||
19 | 20080712 | 22 | 20080712 |
20 | - (djm) OpenBSD CVS Sync | 23 | - (djm) OpenBSD CVS Sync |
@@ -4651,4 +4654,4 @@ | |||
4651 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4654 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4652 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4655 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4653 | 4656 | ||
4654 | $Id: ChangeLog,v 1.5078 2008/07/14 01:29:24 djm Exp $ | 4657 | $Id: ChangeLog,v 1.5079 2008/07/14 02:02:24 djm Exp $ |
diff --git a/openbsd-compat/bindresvport.c b/openbsd-compat/bindresvport.c index 08a53b8cd..c0d5bdb5c 100644 --- a/openbsd-compat/bindresvport.c +++ b/openbsd-compat/bindresvport.c | |||
@@ -54,8 +54,8 @@ bindresvport_sa(int sd, struct sockaddr *sa) | |||
54 | { | 54 | { |
55 | int error, af; | 55 | int error, af; |
56 | struct sockaddr_storage myaddr; | 56 | struct sockaddr_storage myaddr; |
57 | struct sockaddr_in *sin; | 57 | struct sockaddr_in *in; |
58 | struct sockaddr_in6 *sin6; | 58 | struct sockaddr_in6 *in6; |
59 | u_int16_t *portp; | 59 | u_int16_t *portp; |
60 | u_int16_t port; | 60 | u_int16_t port; |
61 | socklen_t salen; | 61 | socklen_t salen; |
@@ -74,13 +74,13 @@ bindresvport_sa(int sd, struct sockaddr *sa) | |||
74 | af = sa->sa_family; | 74 | af = sa->sa_family; |
75 | 75 | ||
76 | if (af == AF_INET) { | 76 | if (af == AF_INET) { |
77 | sin = (struct sockaddr_in *)sa; | 77 | in = (struct sockaddr_in *)sa; |
78 | salen = sizeof(struct sockaddr_in); | 78 | salen = sizeof(struct sockaddr_in); |
79 | portp = &sin->sin_port; | 79 | portp = &in->sin_port; |
80 | } else if (af == AF_INET6) { | 80 | } else if (af == AF_INET6) { |
81 | sin6 = (struct sockaddr_in6 *)sa; | 81 | in6 = (struct sockaddr_in6 *)sa; |
82 | salen = sizeof(struct sockaddr_in6); | 82 | salen = sizeof(struct sockaddr_in6); |
83 | portp = &sin6->sin6_port; | 83 | portp = &in6->sin6_port; |
84 | } else { | 84 | } else { |
85 | errno = EPFNOSUPPORT; | 85 | errno = EPFNOSUPPORT; |
86 | return (-1); | 86 | return (-1); |