diff options
author | djm <djm> | 2005-11-05 04:13:24 +0000 |
---|---|---|
committer | djm <djm> | 2005-11-05 04:13:24 +0000 |
commit | 3eb781c52e8d4273230313ec0dca3ca150364e5a (patch) | |
tree | df62b4792bab817be02dfa83f436e6ca561d9a54 /sshd.c | |
parent | 73fda615fd60b9dd7be341e937e00d8a3e23714d (diff) | |
download | openssh-3eb781c52e8d4273230313ec0dca3ca150364e5a.tar.gz |
- dtucker@cvs.openbsd.org 2005/10/30 08:29:29
[canohost.c sshd.c]
Check for connections with IP options earlier and drop silently. ok djm@
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -42,7 +42,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.315 2005/09/21 23:37:11 djm Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.316 2005/10/30 08:29:29 dtucker Exp $"); #include <openssl/dh.h> #include <openssl/bn.h> @@ -1651,7 +1651,12 @@ main(int ac, char **av) debug("get_remote_port failed"); cleanup_exit(255); } - remote_ip = get_remote_ipaddr(); + + /* + * We use get_canonical_hostname with usedns = 0 instead of + * get_remote_ipaddr here so IP options will be checked. + */ + remote_ip = get_canonical_hostname(0); #ifdef SSH_AUDIT_EVENTS audit_connection_from(remote_ip, remote_port); |