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

Undo ntohs htons nesting to avoid variable shadowing

Browse Source
This commit is contained in:
Viktor Dukhovni
2015-04-10 02:21:35 +00:00
parent f2549127e8
commit 93af13ca12
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/krb5/send_to_kdc.c
View File

@@ -789,6 +789,7 @@ submit_request(krb5_context context, krb5_sendto_ctx ctx, krb5_krbhst_info *hi)
char *el, *proxy = proxy2; char *el, *proxy = proxy2;
struct addrinfo hints; struct addrinfo hints;
char portstr[NI_MAXSERV]; char portstr[NI_MAXSERV];
unsigned short nport;
if (proxy == NULL) if (proxy == NULL)
return ENOMEM; return ENOMEM;
@@ -809,8 +810,9 @@ submit_request(krb5_context context, krb5_sendto_ctx ctx, krb5_krbhst_info *hi)
hints.ai_family = PF_UNSPEC; hints.ai_family = PF_UNSPEC;
hints.ai_socktype = SOCK_STREAM; hints.ai_socktype = SOCK_STREAM;
snprintf(portstr, sizeof(portstr), "%d", /* On some systems ntohs(foo(..., htons(...))) causes shadowing */
ntohs(init_port(el, htons(80)))); nport = init_port(el, htons(80));
snprintf(portstr, sizeof(portstr), "%d", ntohs(nport));
ret = getaddrinfo(proxy, portstr, &hints, &ai); ret = getaddrinfo(proxy, portstr, &hints, &ai);
free(proxy2); free(proxy2);