diff options
| author |   markus <markus@openbsd.org> | 2016-05-04 14:29:58 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2016-05-04 14:29:58 +0000 |
| commit | 94472eef4e2c8d939e51b91bb93d6169d2661baf (patch) | |
| tree | a838888a6859b444a4ce544b3ce818952a499f11 /usr.bin/ssh/readconf.c | |
| parent | move SSH_MSG_NONE, so we don't have to include ssh1.h; ok deraadt@ (diff) | |
| download | wireguard-openbsd-94472eef4e2c8d939e51b91bb93d6169d2661baf.tar.xz wireguard-openbsd-94472eef4e2c8d939e51b91bb93d6169d2661baf.zip | |
allow setting IdentityAgent to SSH_AUTH_SOCK; ok djm@
Diffstat (limited to 'usr.bin/ssh/readconf.c')
| -rw-r--r-- | usr.bin/ssh/readconf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index 7e05e8c49f8..b9cb3884e9e 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/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 @@ -2017,6 +2017,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 */ |