diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-10-03 06:38:35 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-10-03 16:39:58 +1000 |
commit | 5eff5b858e717e901e6af6596306a114de9f79f2 (patch) | |
tree | 1e89894968478a2c5b44cabd9747fd90d51725e1 /ssh_config.5 | |
parent | a46ac4d86b25414d78b632e8173578b37e5f8a83 (diff) |
upstream: Allow ssh_config IdentityAgent directive to accept
environment variable names as well as explicit paths. ok dtucker@
OpenBSD-Commit-ID: 2f0996e103876c53d8c9dd51dcce9889d700767b
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 27136dbd6..4d5b01d3e 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh_config.5,v 1.285 2018/09/21 12:46:22 djm Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.286 2018/10/03 06:38:35 djm Exp $ |
37 | .Dd $Mdocdate: September 21 2018 $ | 37 | .Dd $Mdocdate: October 3 2018 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -877,6 +877,10 @@ If the string | |||
877 | is specified, the location of the socket will be read from the | 877 | is specified, the location of the socket will be read from the |
878 | .Ev SSH_AUTH_SOCK | 878 | .Ev SSH_AUTH_SOCK |
879 | environment variable. | 879 | environment variable. |
880 | Otherwise if the specified value begins with a | ||
881 | .Sq $ | ||
882 | character, then it will be treated as an environment variable containing | ||
883 | the location of the socket. | ||
880 | .Pp | 884 | .Pp |
881 | Arguments to | 885 | Arguments to |
882 | .Cm IdentityAgent | 886 | .Cm IdentityAgent |