rename sa_len' ->
sa_size'
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3484 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -156,7 +156,7 @@ init_socket(struct descr *d, int family, int type, int port)
|
||||
#if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6)
|
||||
struct sockaddr_in6 sin6;
|
||||
#endif
|
||||
int sa_len;
|
||||
int sa_size;
|
||||
|
||||
memset(d, 0, sizeof(*d));
|
||||
d->s = socket(family, type, 0);
|
||||
@@ -179,7 +179,7 @@ init_socket(struct descr *d, int family, int type, int port)
|
||||
sin.sin_port = port;
|
||||
sin.sin_addr.s_addr = INADDR_ANY;
|
||||
sa = (struct sockaddr *)&sin;
|
||||
sa_len = sizeof(sin);
|
||||
sa_size = sizeof(sin);
|
||||
break;
|
||||
#if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6)
|
||||
case AF_INET6 :
|
||||
@@ -188,7 +188,7 @@ init_socket(struct descr *d, int family, int type, int port)
|
||||
sin6.sin6_port = port;
|
||||
sin6.sin6_addr = in6addr_any;
|
||||
sa = (struct sockaddr *)&sin6;
|
||||
sa_len = sizeof(sin6);
|
||||
sa_size = sizeof(sin6);
|
||||
break;
|
||||
#endif
|
||||
default :
|
||||
@@ -198,7 +198,7 @@ init_socket(struct descr *d, int family, int type, int port)
|
||||
return;
|
||||
}
|
||||
|
||||
if(bind(d->s, sa, sa_len) < 0){
|
||||
if(bind(d->s, sa, sa_size) < 0){
|
||||
krb5_warn(context, errno, "bind(%d)", ntohs(port));
|
||||
close(d->s);
|
||||
d->s = -1;
|
||||
|
@@ -181,7 +181,7 @@ krb5_sendto_kdc (krb5_context context,
|
||||
int ret;
|
||||
int family;
|
||||
struct sockaddr *sa;
|
||||
int sa_len;
|
||||
int sa_size;
|
||||
struct sockaddr_in sin;
|
||||
#if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6)
|
||||
struct sockaddr_in6 sin6;
|
||||
@@ -199,7 +199,7 @@ krb5_sendto_kdc (krb5_context context,
|
||||
switch (family) {
|
||||
case AF_INET :
|
||||
memset(&sin, 0, sizeof(sin));
|
||||
sa_len = sizeof(sin);
|
||||
sa_size = sizeof(sin);
|
||||
sa = (struct sockaddr *)&sin;
|
||||
sin.sin_family = family;
|
||||
sin.sin_port = init_port(colon, port);
|
||||
@@ -208,7 +208,7 @@ krb5_sendto_kdc (krb5_context context,
|
||||
#if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6)
|
||||
case AF_INET6:
|
||||
memset(&sin6, 0, sizeof(sin6));
|
||||
sa_len = sizeof(sin6);
|
||||
sa_size = sizeof(sin6);
|
||||
sa = (struct sockaddr *)&sin6;
|
||||
sin6.sin6_family = family;
|
||||
sin6.sin6_port = init_port(colon, port);
|
||||
@@ -219,7 +219,7 @@ krb5_sendto_kdc (krb5_context context,
|
||||
continue;
|
||||
}
|
||||
|
||||
if(connect(fd, sa, sa_len) < 0) {
|
||||
if(connect(fd, sa, sa_size) < 0) {
|
||||
close (fd);
|
||||
continue;
|
||||
}
|
||||
|
Reference in New Issue
Block a user