diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-12-21 02:19:13 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-12-21 13:22:07 +1100 |
commit | 40be78f503277bd91c958fa25ea9ef918a2ffd3d (patch) | |
tree | b17303fad21f97437b44cf3264a03abfd503ebdf /readconf.h | |
parent | 416f15372bfb5be1709a0ad1d00ef5d8ebfb9e0e (diff) |
upstream: Allow forwarding a different agent socket to the path
specified by $SSH_AUTH_SOCK, by extending the existing ForwardAgent option to
accepting an explicit path or the name of an environment variable in addition
to yes/no.
Patch by Eric Chiang, manpage by me; ok markus@
OpenBSD-Commit-ID: 98f2ed80bf34ea54d8b2ddd19ac14ebbf40e9265
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h index 51d540b88..dcecfc54a 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.130 2019/10/31 21:18:28 djm Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.131 2019/12/21 02:19:13 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -29,6 +29,7 @@ struct allowed_cname { | |||
29 | 29 | ||
30 | typedef struct { | 30 | typedef struct { |
31 | int forward_agent; /* Forward authentication agent. */ | 31 | int forward_agent; /* Forward authentication agent. */ |
32 | char *forward_agent_sock_path; /* Optional path of the agent. */ | ||
32 | int forward_x11; /* Forward X11 display. */ | 33 | int forward_x11; /* Forward X11 display. */ |
33 | int forward_x11_timeout; /* Expiration for Cookies */ | 34 | int forward_x11_timeout; /* Expiration for Cookies */ |
34 | int forward_x11_trusted; /* Trust Forward X11 display. */ | 35 | int forward_x11_trusted; /* Trust Forward X11 display. */ |