summaryrefslogtreecommitdiff
path: root/canohost.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-11-05 15:13:24 +1100
committerDamien Miller <djm@mindrot.org>2005-11-05 15:13:24 +1100
commit4d3fd54c91dae68ea2642387196015931ee83200 (patch)
tree4d707d50bad03f27435fef1f38bad055de68a603 /canohost.c
parentaa3bb1094011e640488e9f2ebd718a79960b147d (diff)
downloadopenssh-git-4d3fd54c91dae68ea2642387196015931ee83200.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 'canohost.c')
-rw-r--r--canohost.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/canohost.c b/canohost.c
index 0c4d36ff..66867c10 100644
--- a/canohost.c
+++ b/canohost.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: canohost.c,v 1.45 2005/10/03 07:44:42 dtucker Exp $");
+RCSID("$OpenBSD: canohost.c,v 1.46 2005/10/30 08:29:29 dtucker Exp $");
#include "packet.h"
#include "xmalloc.h"
@@ -158,9 +158,7 @@ check_ip_options(int sock, char *ipaddr)
for (i = 0; i < option_size; i++)
snprintf(text + i*3, sizeof(text) - i*3,
" %2.2x", options[i]);
- logit("Connection from %.100s with IP options:%.800s",
- ipaddr, text);
- packet_disconnect("Connection from %.100s with IP options:%.800s",
+ fatal("Connection from %.100s with IP options:%.800s",
ipaddr, text);
}
#endif /* IP_OPTIONS */