summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/readconf.c
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2016-05-04 14:29:59 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2016-05-04 14:29:59 +0000
commitaf81b7d497efd16720cc2ac3d3c2e762a68b3d38 (patch)
tree60901c4d72f6e0acd4eccfc29a763993cdf49292 /usr.bin/ssh/readconf.c
parent99196dce1f464286fbacec47930e15d19551dbf6 (diff)
allow setting IdentityAgent to SSH_AUTH_SOCK; ok djm@
Diffstat (limited to 'usr.bin/ssh/readconf.c')
-rw-r--r--usr.bin/ssh/readconf.c3
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 */