oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

rename sa_len' -> sa_size'

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3484 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-09-12 23:22:32 +00:00
parent 716d88598a
commit b09f153c01
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kdc/connect.c
View File

@@ -156,7 +156,7 @@ init_socket(struct descr *d, int family, int type, int port)
#if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6) #if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6)
struct sockaddr_in6 sin6; struct sockaddr_in6 sin6;
#endif #endif
int sa_len; int sa_size;
memset(d, 0, sizeof(*d)); memset(d, 0, sizeof(*d));
d->s = socket(family, type, 0); 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_port = port;
sin.sin_addr.s_addr = INADDR_ANY; sin.sin_addr.s_addr = INADDR_ANY;
sa = (struct sockaddr *)&sin; sa = (struct sockaddr *)&sin;
sa_len = sizeof(sin); sa_size = sizeof(sin);
break; break;
#if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6) #if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6)
case AF_INET6 : case AF_INET6 :
@@ -188,7 +188,7 @@ init_socket(struct descr *d, int family, int type, int port)
sin6.sin6_port = port; sin6.sin6_port = port;
sin6.sin6_addr = in6addr_any; sin6.sin6_addr = in6addr_any;
sa = (struct sockaddr *)&sin6; sa = (struct sockaddr *)&sin6;
sa_len = sizeof(sin6); sa_size = sizeof(sin6);
break; break;
#endif #endif
default : default :
@@ -198,7 +198,7 @@ init_socket(struct descr *d, int family, int type, int port)
return; 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)); krb5_warn(context, errno, "bind(%d)", ntohs(port));
close(d->s); close(d->s);
d->s = -1; d->s = -1;

8
lib/krb5/send_to_kdc.c
View File

@@ -181,7 +181,7 @@ krb5_sendto_kdc (krb5_context context,
int ret; int ret;
int family; int family;
struct sockaddr *sa; struct sockaddr *sa;
int sa_len; int sa_size;
struct sockaddr_in sin; struct sockaddr_in sin;
#if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6) #if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6)
struct sockaddr_in6 sin6; struct sockaddr_in6 sin6;
@@ -199,7 +199,7 @@ krb5_sendto_kdc (krb5_context context,
switch (family) { switch (family) {
case AF_INET : case AF_INET :
memset(&sin, 0, sizeof(sin)); memset(&sin, 0, sizeof(sin));
sa_len = sizeof(sin); sa_size = sizeof(sin);
sa = (struct sockaddr *)&sin; sa = (struct sockaddr *)&sin;
sin.sin_family = family; sin.sin_family = family;
sin.sin_port = init_port(colon, port); 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) #if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6)
case AF_INET6: case AF_INET6:
memset(&sin6, 0, sizeof(sin6)); memset(&sin6, 0, sizeof(sin6));
sa_len = sizeof(sin6); sa_size = sizeof(sin6);
sa = (struct sockaddr *)&sin6; sa = (struct sockaddr *)&sin6;
sin6.sin6_family = family; sin6.sin6_family = family;
sin6.sin6_port = init_port(colon, port); sin6.sin6_port = init_port(colon, port);
@@ -219,7 +219,7 @@ krb5_sendto_kdc (krb5_context context,
continue; continue;
} }
if(connect(fd, sa, sa_len) < 0) { if(connect(fd, sa, sa_size) < 0) {
close (fd); close (fd);
continue; continue;
} }