src/usr.bin/ssh/ssh_config.5 - diff

Return to ssh_config.5 CVS log

Up to [local] / src / usr.bin / ssh

-version 1.221, 2015/09/24 06:15:11
+version 1.222, 2015/11/15 22:26:49
 Line 221
 Line 221
 Line 221
  (this keyword may be useful in system-wide
  .Nm
  files).
+ .It Cm AddKeysToAgent
+ Specifies whether keys should be automatically added to a running
+ .Xr ssh-agent 5 .
+ If this option is set to
+ .Dq yes
+ and a key is loaded from a file, the key and its passphrase are added to
+ the agent with the default lifetime, as if by
+ .Xr ssh-add 1 .
+ If this option is set to
+ .Dq ask ,
+ .Nm ssh
+ will require confirmation using the
+ .Ev SSH_ASKPASS
+ program before adding a key (see
+ .Xr ssh-add 1
+ for details).
+ If this option is set to
+ .Dq confirm ,
+ each use of the key must be confirmed, as if the
+ .Fl c
+ option was specified to
+ .Xr ssh-add 1 .
+ If this option is set to
+ .Dq no ,
+ no keys are added to the agent.
+ The argument must be
+ .Dq yes ,
+ .Dq confirm ,
+ .Dq ask ,
+ or
+ .Dq no .
+ The default is
+ .Dq no .
  .It Cm AddressFamily
  Specifies which address family to use when connecting.
  Valid arguments are