summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshconnect.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index efe3bea9a..edcb7449f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@
25 - itojun@cvs.openbsd.org 2002/06/08 21:15:27 25 - itojun@cvs.openbsd.org 2002/06/08 21:15:27
26 [sshconnect.c] 26 [sshconnect.c]
27 always use getnameinfo. (diag message only) 27 always use getnameinfo. (diag message only)
28 - markus@cvs.openbsd.org 2002/06/09 04:33:27
29 [sshconnect.c]
30 abort() - > fatal()
28 31
2920020607 3220020607
30 - (bal) Removed --{enable/disable}-suid-ssh 33 - (bal) Removed --{enable/disable}-suid-ssh
@@ -856,4 +859,4 @@
856 - (stevesk) entropy.c: typo in debug message 859 - (stevesk) entropy.c: typo in debug message
857 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 860 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
858 861
859$Id: ChangeLog,v 1.2196 2002/06/09 20:14:54 mouring Exp $ 862$Id: ChangeLog,v 1.2197 2002/06/09 20:16:22 mouring Exp $
diff --git a/sshconnect.c b/sshconnect.c
index 9444e3cf2..369b31dfe 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
13 */ 13 */
14 14
15#include "includes.h" 15#include "includes.h"
16RCSID("$OpenBSD: sshconnect.c,v 1.121 2002/06/08 21:15:27 itojun Exp $"); 16RCSID("$OpenBSD: sshconnect.c,v 1.122 2002/06/09 04:33:27 markus Exp $");
17 17
18#include <openssl/bn.h> 18#include <openssl/bn.h>
19 19
@@ -50,7 +50,7 @@ sockaddr_ntop(struct sockaddr *sa)
50 50
51 if (getnameinfo(sa, sa->sa_len, addrbuf, sizeof(addrbuf), NULL, 0, 51 if (getnameinfo(sa, sa->sa_len, addrbuf, sizeof(addrbuf), NULL, 0,
52 NI_NUMERICHOST) != 0) 52 NI_NUMERICHOST) != 0)
53 abort(); /* XXX abort is bad -- do something else */ 53 fatal("sockaddr_ntop: getnameinfo NI_NUMERICHOST failed");
54 return addrbuf; 54 return addrbuf;
55} 55}
56 56