summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>2001-06-22 14:31:47 +0000
committerEzra Peisach <epeisach@mit.edu>2001-06-22 14:31:47 +0000
commit6cdcc51402cfaf4ad9853e41239ce987128dc9ae (patch)
tree37250b99e2548a0579a42bce77354003dec3e899 /src
parent94b4cf9c13debd4ccac00ccfecbb35ae49acd492 (diff)
downloadkrb5-6cdcc51402cfaf4ad9853e41239ce987128dc9ae.tar.gz
krb5-6cdcc51402cfaf4ad9853e41239ce987128dc9ae.tar.xz
krb5-6cdcc51402cfaf4ad9853e41239ce987128dc9ae.zip
* network.c (setup_port): Change sin to sin4 to prevent shadowing
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13490 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/kdc/ChangeLog4
-rw-r--r--src/kdc/network.c10
2 files changed, 9 insertions, 5 deletions
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index b09540444..b5c13e54f 100644
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-22 Ezra Peisach <epeisach@mit.edu>
+
+ * network.c (setup_port): Change sin to sin4 to prevent shadowing.
+
2001-06-21 Ezra Peisach <epeisach@mit.edu>
* configure.in: Test for daemon prototype.
diff --git a/src/kdc/network.c b/src/kdc/network.c
index 7e300ec8e..d96b9be55 100644
--- a/src/kdc/network.c
+++ b/src/kdc/network.c
@@ -444,30 +444,30 @@ setup_port(void *P_data, struct sockaddr *addr)
switch (addr->sa_family) {
case AF_INET:
{
- struct sockaddr_in *sin = (struct sockaddr_in *) addr, psin;
+ struct sockaddr_in *sin4 = (struct sockaddr_in *) addr, psin;
for (i = 0; i < n_udp_ports; i++) {
sock = socket (PF_INET, SOCK_DGRAM, 0);
if (sock == -1) {
data->retval = errno;
com_err(data->prog, data->retval,
"Cannot create server socket for port %d address %s",
- udp_port_nums[i], inet_ntoa (sin->sin_addr));
+ udp_port_nums[i], inet_ntoa (sin4->sin_addr));
return 1;
}
- psin = *sin;
+ psin = *sin4;
psin.sin_port = htons (udp_port_nums[i]);
if (bind (sock, (struct sockaddr *)&psin, sizeof (psin)) == -1) {
data->retval = errno;
com_err(data->prog, data->retval,
"Cannot bind server socket to port %d address %s",
- udp_port_nums[i], inet_ntoa (sin->sin_addr));
+ udp_port_nums[i], inet_ntoa (sin4->sin_addr));
return 1;
}
FD_SET (sock, &select_fds);
if (sock > select_nfds)
select_nfds = sock;
krb5_klog_syslog (LOG_INFO, "listening on fd %d: %s port %d", sock,
- inet_ntoa (sin->sin_addr), udp_port_nums[i]);
+ inet_ntoa (sin4->sin_addr), udp_port_nums[i]);
if (add_fd (data, sock))
return 1;
}