summaryrefslogtreecommitdiff
path: root/canohost.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-12-21 14:45:46 +1100
committerDamien Miller <djm@mindrot.org>2001-12-21 14:45:46 +1100
commit9f0f5c64bc4b6144e3fed6a7f538f7c21819a492 (patch)
treef79317ab211f59181a61b526f566e9c8cfe70c73 /canohost.c
parent89681214ca2f50a1b1ed6164c3afe1ce14995ffc (diff)
- deraadt@cvs.openbsd.org 2001/12/19 07:18:56
[auth1.c auth2.c auth2-chall.c auth-bsdauth.c auth.c authfile.c auth.h] [auth-krb4.c auth-rhosts.c auth-skey.c bufaux.c canohost.c channels.c] [cipher.c clientloop.c compat.c compress.c deattack.c key.c log.c mac.c] [match.c misc.c nchan.c packet.c readconf.c rijndael.c rijndael.h scard.c] [servconf.c servconf.h serverloop.c session.c sftp.c sftp-client.c] [sftp-glob.c sftp-int.c sftp-server.c ssh-add.c ssh-agent.c ssh.c] [sshconnect1.c sshconnect2.c sshconnect.c sshd.8 sshd.c sshd_config] [ssh-keygen.c sshlogin.c sshpty.c sshtty.c ttymodes.c uidswap.c] basic KNF done while i was looking for something else
Diffstat (limited to 'canohost.c')
-rw-r--r--canohost.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/canohost.c b/canohost.c
index 015a328e8..4f2e576b2 100644
--- a/canohost.c
+++ b/canohost.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: canohost.c,v 1.28 2001/12/05 03:56:39 itojun Exp $"); 15RCSID("$OpenBSD: canohost.c,v 1.29 2001/12/19 07:18:56 deraadt Exp $");
16 16
17#include "packet.h" 17#include "packet.h"
18#include "xmalloc.h" 18#include "xmalloc.h"
@@ -68,13 +68,13 @@ get_remote_hostname(int socket, int reverse_mapping_check)
68 check_ip_options(socket, ntop); 68 check_ip_options(socket, ntop);
69 69
70 if (getnameinfo((struct sockaddr *)&from, fromlen, ntop, sizeof(ntop), 70 if (getnameinfo((struct sockaddr *)&from, fromlen, ntop, sizeof(ntop),
71 NULL, 0, NI_NUMERICHOST) != 0) 71 NULL, 0, NI_NUMERICHOST) != 0)
72 fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed"); 72 fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed");
73 73
74 debug3("Trying to reverse map address %.100s.", ntop); 74 debug3("Trying to reverse map address %.100s.", ntop);
75 /* Map the IP address to a host name. */ 75 /* Map the IP address to a host name. */
76 if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), 76 if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
77 NULL, 0, NI_NAMEREQD) != 0) { 77 NULL, 0, NI_NAMEREQD) != 0) {
78 /* Host name not found. Use ip address. */ 78 /* Host name not found. Use ip address. */
79 log("Could not reverse map address %.100s.", ntop); 79 log("Could not reverse map address %.100s.", ntop);
80 return xstrdup(ntop); 80 return xstrdup(ntop);
@@ -230,7 +230,7 @@ get_socket_address(int socket, int remote, int flags)
230 } 230 }
231 /* Get the address in ascii. */ 231 /* Get the address in ascii. */
232 if (getnameinfo((struct sockaddr *)&addr, addrlen, ntop, sizeof(ntop), 232 if (getnameinfo((struct sockaddr *)&addr, addrlen, ntop, sizeof(ntop),
233 NULL, 0, flags) != 0) { 233 NULL, 0, flags) != 0) {
234 error("get_socket_ipaddr: getnameinfo %d failed", flags); 234 error("get_socket_ipaddr: getnameinfo %d failed", flags);
235 return NULL; 235 return NULL;
236 } 236 }
@@ -316,7 +316,7 @@ get_sock_port(int sock, int local)
316 } 316 }
317 /* Return port number. */ 317 /* Return port number. */
318 if (getnameinfo((struct sockaddr *)&from, fromlen, NULL, 0, 318 if (getnameinfo((struct sockaddr *)&from, fromlen, NULL, 0,
319 strport, sizeof(strport), NI_NUMERICSERV) != 0) 319 strport, sizeof(strport), NI_NUMERICSERV) != 0)
320 fatal("get_sock_port: getnameinfo NI_NUMERICSERV failed"); 320 fatal("get_sock_port: getnameinfo NI_NUMERICSERV failed");
321 return atoi(strport); 321 return atoi(strport);
322} 322}