summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--canohost.c4
2 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index b83507e01..296474ba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,14 @@
120010418 120010418
2 - OpenBSD CVS Sync 2 - OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2001/04/17 19:34:25 3 - markus@cvs.openbsd.org 2001/04/17 19:34:25
4 [session.c] 4 [session.c]
5 move auth_approval to do_authenticated(). 5 move auth_approval to do_authenticated().
6 do_child(): nuke hostkeys from memory 6 do_child(): nuke hostkeys from memory
7 don't source .ssh/rc for subsystems. 7 don't source .ssh/rc for subsystems.
8 - markus@cvs.openbsd.org 2001/04/18 14:15:00
9 [canohost.c]
10 debug->debug3
11
820010417 1220010417
9 - (bal) Add perl5 check for HP/UX, Removed GNUness from Makefile.in 13 - (bal) Add perl5 check for HP/UX, Removed GNUness from Makefile.in
10 and temporary commented out 'catman-do:' since it is broken. Patches 14 and temporary commented out 'catman-do:' since it is broken. Patches
@@ -5152,4 +5156,4 @@
5152 - Wrote replacements for strlcpy and mkdtemp 5156 - Wrote replacements for strlcpy and mkdtemp
5153 - Released 1.0pre1 5157 - Released 1.0pre1
5154 5158
5155$Id: ChangeLog,v 1.1136 2001/04/18 15:29:33 mouring Exp $ 5159$Id: ChangeLog,v 1.1137 2001/04/18 15:32:44 mouring Exp $
diff --git a/canohost.c b/canohost.c
index 823545d4c..5d345eb27 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.25 2001/04/12 19:15:24 markus Exp $"); 15RCSID("$OpenBSD: canohost.c,v 1.26 2001/04/18 14:15:00 markus Exp $");
16 16
17#include "packet.h" 17#include "packet.h"
18#include "xmalloc.h" 18#include "xmalloc.h"
@@ -71,7 +71,7 @@ get_remote_hostname(int socket, int reverse_mapping_check)
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 debug("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) {