diff options
Diffstat (limited to 'canohost.c')
-rw-r--r-- | canohost.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/canohost.c b/canohost.c index 438175f76..fca7134f9 100644 --- a/canohost.c +++ b/canohost.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: canohost.c,v 1.37 2003/06/02 09:17:34 markus Exp $"); | 15 | RCSID("$OpenBSD: canohost.c,v 1.38 2003/09/23 20:17:11 markus Exp $"); |
16 | 16 | ||
17 | #include "packet.h" | 17 | #include "packet.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -40,7 +40,7 @@ get_remote_hostname(int socket, int use_dns) | |||
40 | memset(&from, 0, sizeof(from)); | 40 | memset(&from, 0, sizeof(from)); |
41 | if (getpeername(socket, (struct sockaddr *)&from, &fromlen) < 0) { | 41 | if (getpeername(socket, (struct sockaddr *)&from, &fromlen) < 0) { |
42 | debug("getpeername failed: %.100s", strerror(errno)); | 42 | debug("getpeername failed: %.100s", strerror(errno)); |
43 | fatal_cleanup(); | 43 | cleanup_exit(255); |
44 | } | 44 | } |
45 | #ifdef IPV4_IN_IPV6 | 45 | #ifdef IPV4_IN_IPV6 |
46 | if (from.ss_family == AF_INET6) { | 46 | if (from.ss_family == AF_INET6) { |
@@ -296,7 +296,7 @@ get_remote_ipaddr(void) | |||
296 | canonical_host_ip = | 296 | canonical_host_ip = |
297 | get_peer_ipaddr(packet_get_connection_in()); | 297 | get_peer_ipaddr(packet_get_connection_in()); |
298 | if (canonical_host_ip == NULL) | 298 | if (canonical_host_ip == NULL) |
299 | fatal_cleanup(); | 299 | cleanup_exit(255); |
300 | } else { | 300 | } else { |
301 | /* If not on socket, return UNKNOWN. */ | 301 | /* If not on socket, return UNKNOWN. */ |
302 | canonical_host_ip = xstrdup("UNKNOWN"); | 302 | canonical_host_ip = xstrdup("UNKNOWN"); |
@@ -336,7 +336,7 @@ get_sock_port(int sock, int local) | |||
336 | } else { | 336 | } else { |
337 | if (getpeername(sock, (struct sockaddr *)&from, &fromlen) < 0) { | 337 | if (getpeername(sock, (struct sockaddr *)&from, &fromlen) < 0) { |
338 | debug("getpeername failed: %.100s", strerror(errno)); | 338 | debug("getpeername failed: %.100s", strerror(errno)); |
339 | fatal_cleanup(); | 339 | cleanup_exit(255); |
340 | } | 340 | } |
341 | } | 341 | } |
342 | 342 | ||