summaryrefslogtreecommitdiff
path: root/readconf.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-06-26 10:02:24 +1000
committerDamien Miller <djm@mindrot.org>2010-06-26 10:02:24 +1000
commit1ab6a51f9b258a6e844f1ee442c15aec7fcb6a72 (patch)
tree708954349afa3ef3f1294934443d5773c1b6b53f /readconf.h
parent383ffe6c5f31d3ecd89caadc8aef1bc2b821d63a (diff)
downloadopenssh-git-1ab6a51f9b258a6e844f1ee442c15aec7fcb6a72.tar.gz
- djm@cvs.openbsd.org 2010/06/25 23:10:30
[ssh.c] log the hostname and address that we connected to at LogLevel=verbose after authentication is successful to mitigate "phishing" attacks by servers with trusted keys that accept authentication silently and automatically before presenting fake password/passphrase prompts; "nice!" markus@
Diffstat (limited to 'readconf.h')
-rw-r--r--readconf.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h
index 3c8eae9d..66acafde 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.84 2010/06/25 07:14:46 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.85 2010/06/25 23:15:36 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -32,6 +32,7 @@ typedef struct {
typedef struct {
int forward_agent; /* Forward authentication agent. */
int forward_x11; /* Forward X11 display. */
+ int forward_x11_timeout; /* Expiration for Cookies */
int forward_x11_trusted; /* Trust Forward X11 display. */
int exit_on_forward_failure; /* Exit if bind(2) fails for -L/-R */
char *xauth_location; /* Location for xauth program */