diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-06-23 16:09:08 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-06-23 16:09:08 +0000 |
| commit | 80628bacb0b4bc1daaef4e038e755602c972bede (patch) | |
| tree | cc93abce4a81ab84afa26d861b756d5c77818afa /crypto/openssh/canohost.c | |
| parent | f191b6f96cdb3270a60bcb6219ce0998bdd25cde (diff) | |
| download | src-80628bacb0b4bc1daaef4e038e755602c972bede.tar.gz src-80628bacb0b4bc1daaef4e038e755602c972bede.zip | |
Resolve conflicts. Known issues:
- sshd fails to set TERM correctly.
- privilege separation may break PAM and is currently turned off.
- man pages have not yet been updated
I will have these issues resolved, and privilege separation turned on by
default, in time for DP2.
Sponsored by: DARPA, NAI Labs
Notes
Notes:
svn path=/head/; revision=98684
Diffstat (limited to 'crypto/openssh/canohost.c')
| -rw-r--r-- | crypto/openssh/canohost.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/openssh/canohost.c b/crypto/openssh/canohost.c index 2892aaa715fb..b0a0eb6888cd 100644 --- a/crypto/openssh/canohost.c +++ b/crypto/openssh/canohost.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: canohost.c,v 1.31 2002/02/27 21:23:13 stevesk Exp $"); +RCSID("$OpenBSD: canohost.c,v 1.32 2002/06/11 08:11:45 itojun Exp $"); RCSID("$FreeBSD$"); #include "packet.h" @@ -43,13 +43,14 @@ get_remote_hostname(int socket, int verify_reverse_mapping) debug("getpeername failed: %.100s", strerror(errno)); fatal_cleanup(); } - if (from.ss_family == AF_INET) - check_ip_options(socket, ntop); if (getnameinfo((struct sockaddr *)&from, fromlen, ntop, sizeof(ntop), NULL, 0, NI_NUMERICHOST) != 0) fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed"); + if (from.ss_family == AF_INET) + check_ip_options(socket, ntop); + debug3("Trying to reverse map address %.100s.", ntop); /* Map the IP address to a host name. */ if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), |