diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2007-12-28 16:43:51 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2007-12-28 16:43:51 +0100 |
| commit | 4abde771b73f3a54780ff3dedf59f57f94298870 (patch) | |
| tree | 7973cf3fd2910dac0e8db591f690750d19fd4421 /sshconnect.c | |
| parent | - djm@cvs.openbsd.org 2007/12/12 05:04:03 (diff) | |
| download | openssh-4abde771b73f3a54780ff3dedf59f57f94298870.tar.xz openssh-4abde771b73f3a54780ff3dedf59f57f94298870.zip | |
- dtucker@cvs.openbsd.org 2007/12/27 14:22:08
[servconf.c canohost.c misc.c channels.c sshconnect.c misc.h ssh-keyscan.c
sshd.c]
Add a small helper function to consistently handle the EAI_SYSTEM error
code of getaddrinfo. Prompted by vgiffin at apple com via bz #1417.
ok markus@ stevesk@
Diffstat (limited to 'sshconnect.c')
| -rw-r--r-- | sshconnect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sshconnect.c b/sshconnect.c index 933df39fa..a604c9724 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.202 2007/09/04 11:15:55 djm Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.203 2007/12/27 14:22:08 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -224,7 +224,7 @@ ssh_create_socket(int privileged, struct addrinfo *ai) gaierr = getaddrinfo(options.bind_address, "0", &hints, &res); if (gaierr) { error("getaddrinfo: %s: %s", options.bind_address, - gai_strerror(gaierr)); + ssh_gai_strerror(gaierr)); close(sock); return -1; } @@ -356,8 +356,8 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, hints.ai_socktype = SOCK_STREAM; snprintf(strport, sizeof strport, "%u", port); if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0) - fatal("%s: %.100s: %s", __progname, host, - gai_strerror(gaierr)); + fatal("%s: Could not resolve hostname %.100s: %s", __progname, + host, ssh_gai_strerror(gaierr)); for (attempt = 0; attempt < connection_attempts; attempt++) { if (attempt > 0) { |