diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2016-05-04 16:29:58 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-05-19 09:48:35 +0200 |
| commit | 1a75d14daf4b60db903e6103cf50e74e0cd0a76b (patch) | |
| tree | c6b0bc7d927ee6d75290401ca7302400d4290f12 /readconf.c | |
| parent | upstream commit (diff) | |
| download | openssh-1a75d14daf4b60db903e6103cf50e74e0cd0a76b.tar.xz openssh-1a75d14daf4b60db903e6103cf50e74e0cd0a76b.zip | |
upstream commit
allow setting IdentityAgent to SSH_AUTH_SOCK; ok djm@
Upstream-ID: 20c508480d8db3eef18942c0fc39b1fcf25652ac
Diffstat (limited to 'readconf.c')
| -rw-r--r-- | readconf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/readconf.c b/readconf.c index 26436b3ac..c706fbf46 100644 --- a/readconf.c +++ b/readconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.253 2016/05/04 12:21:53 markus Exp $ */ +/* $OpenBSD: readconf.c,v 1.254 2016/05/04 14:29:58 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2034,6 +2034,7 @@ fill_default_options(Options * options) CLEAR_ON_NONE(options->proxy_command); CLEAR_ON_NONE(options->control_path); CLEAR_ON_NONE(options->revoked_host_keys); + /* options->identity_agent distinguishes NULL from 'none' */ /* options->user will be set in the main program if appropriate */ /* options->hostname will be set in the main program if appropriate */ /* options->host_key_alias should not be set by default */ |