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

(addr_to_string): use krb5_print_address

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5798 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-03-29 19:01:08 +00:00
parent 8b8deb9fbc
commit 806731da51
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kdc/connect.c
View File

@@ -238,7 +238,7 @@ init_sockets(struct descr **desc)
ports[i].family, ports[i].type, ports[i].port); ports[i].family, ports[i].type, ports[i].port);
if(d[num].s != -1){ if(d[num].s != -1){
char a_str[80]; char a_str[80];
int len; size_t len;
krb5_print_address (&addresses.val[j], a_str, krb5_print_address (&addresses.val[j], a_str,
sizeof(a_str), &len); sizeof(a_str), &len);
@@ -292,7 +292,7 @@ process_request(unsigned char *buf,
do_version4(buf, len, reply, from, (struct sockaddr_in*)addr); do_version4(buf, len, reply, from, (struct sockaddr_in*)addr);
return 0; return 0;
}else if(decode_Ticket(buf, len, &ticket, &i) == 0){ }else if(decode_Ticket(buf, len, &ticket, &i) == 0){
ret = do_524(&ticket, reply, from, (struct sockaddr_in*)addr); ret = do_524(&ticket, reply, from, addr);
free_Ticket(&ticket); free_Ticket(&ticket);
return ret; return ret;
} }
@@ -310,20 +310,14 @@ process_request(unsigned char *buf,
static void static void
addr_to_string(struct sockaddr *addr, size_t addr_len, char *str, size_t len) addr_to_string(struct sockaddr *addr, size_t addr_len, char *str, size_t len)
{ {
switch(addr->sa_family){ krb5_address a;
case AF_INET: krb5_sockaddr2address(addr, &a);
strncpy(str, inet_ntoa(((struct sockaddr_in*)addr)->sin_addr), len); if(krb5_print_address(&a, str, len, &len) == 0) {
break; krb5_free_address(context, &a);
#if defined(HAVE_IPV6) && defined(HAVE_INET_NTOP) return;
case AF_INET6 :
inet_ntop(AF_INET6, &((struct sockaddr_in6*)addr)->sin6_addr,
str, len);
break;
#endif
default:
snprintf(str, len, "<%d addr>", addr->sa_family);
} }
str[len - 1] = 0; krb5_free_address(context, &a);
snprintf(str, len, "<family=%d>", addr->sa_family);
} }
static void static void