diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:42:53 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:42:53 +0000 |
commit | 87552344215a38d3a2b0d4d63dc151e05978bbe1 (patch) | |
tree | 9f4b96055e6ccaa915e8d59d9f2805e9e119371d /ssh_config.5 | |
parent | a25ec0b132c44c9e341e08464ff830de06b81126 (diff) | |
parent | ef94e5613d37bcbf880f21ee6094e4b1c7683a4c (diff) |
import openssh-5.1p1-gsskex-cjwatson-20080722.patch
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 42 |
1 files changed, 38 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 53596e63a..15eecb6ff 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -34,8 +34,8 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh_config.5,v 1.102 2007/08/15 12:13:41 stevesk Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.111 2008/06/26 11:46:31 grunk Exp $ |
38 | .Dd $Mdocdate: August 15 2007 $ | 38 | .Dd $Mdocdate: June 26 2008 $ |
39 | .Dt SSH_CONFIG 5 | 39 | .Dt SSH_CONFIG 5 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -103,6 +103,7 @@ Restricts the following declarations (up to the next | |||
103 | .Cm Host | 103 | .Cm Host |
104 | keyword) to be only for those hosts that match one of the patterns | 104 | keyword) to be only for those hosts that match one of the patterns |
105 | given after the keyword. | 105 | given after the keyword. |
106 | If more than one pattern is provided, they should be separated by whitepsace. | ||
106 | A single | 107 | A single |
107 | .Ql * | 108 | .Ql * |
108 | as a pattern can be used to provide global | 109 | as a pattern can be used to provide global |
@@ -593,6 +594,14 @@ escape characters: | |||
593 | It is possible to have | 594 | It is possible to have |
594 | multiple identity files specified in configuration files; all these | 595 | multiple identity files specified in configuration files; all these |
595 | identities will be tried in sequence. | 596 | identities will be tried in sequence. |
597 | .It Cm KbdInteractiveAuthentication | ||
598 | Specifies whether to use keyboard-interactive authentication. | ||
599 | The argument to this keyword must be | ||
600 | .Dq yes | ||
601 | or | ||
602 | .Dq no . | ||
603 | The default is | ||
604 | .Dq yes . | ||
596 | .It Cm KbdInteractiveDevices | 605 | .It Cm KbdInteractiveDevices |
597 | Specifies the list of methods to use in keyboard-interactive authentication. | 606 | Specifies the list of methods to use in keyboard-interactive authentication. |
598 | Multiple method names must be comma-separated. | 607 | Multiple method names must be comma-separated. |
@@ -608,7 +617,22 @@ and | |||
608 | Specifies a command to execute on the local machine after successfully | 617 | Specifies a command to execute on the local machine after successfully |
609 | connecting to the server. | 618 | connecting to the server. |
610 | The command string extends to the end of the line, and is executed with | 619 | The command string extends to the end of the line, and is executed with |
611 | .Pa /bin/sh . | 620 | the user's shell. |
621 | The following escape character substitutions will be performed: | ||
622 | .Ql %d | ||
623 | (local user's home directory), | ||
624 | .Ql %h | ||
625 | (remote host name), | ||
626 | .Ql %l | ||
627 | (local host name), | ||
628 | .Ql %n | ||
629 | (host name as provided on the command line), | ||
630 | .Ql %p | ||
631 | (remote port), | ||
632 | .Ql %r | ||
633 | (remote user name) or | ||
634 | .Ql %u | ||
635 | (local user name). | ||
612 | This directive is ignored unless | 636 | This directive is ignored unless |
613 | .Cm PermitLocalCommand | 637 | .Cm PermitLocalCommand |
614 | has been enabled. | 638 | has been enabled. |
@@ -732,7 +756,7 @@ if version 2 is not available. | |||
732 | Specifies the command to use to connect to the server. | 756 | Specifies the command to use to connect to the server. |
733 | The command | 757 | The command |
734 | string extends to the end of the line, and is executed with | 758 | string extends to the end of the line, and is executed with |
735 | .Pa /bin/sh . | 759 | the user's shell. |
736 | In the command string, | 760 | In the command string, |
737 | .Ql %h | 761 | .Ql %h |
738 | will be substituted by the host name to | 762 | will be substituted by the host name to |
@@ -1053,6 +1077,16 @@ See also | |||
1053 | .Sx VERIFYING HOST KEYS | 1077 | .Sx VERIFYING HOST KEYS |
1054 | in | 1078 | in |
1055 | .Xr ssh 1 . | 1079 | .Xr ssh 1 . |
1080 | .It Cm VisualHostKey | ||
1081 | If this flag is set to | ||
1082 | .Dq yes , | ||
1083 | an ASCII art representation of the remote host key fingerprint is | ||
1084 | printed additionally to the hex fingerprint string. | ||
1085 | If this flag is set to | ||
1086 | .Dq no , | ||
1087 | only the hex fingerprint string will be printed. | ||
1088 | The default is | ||
1089 | .Dq no . | ||
1056 | .It Cm XAuthLocation | 1090 | .It Cm XAuthLocation |
1057 | Specifies the full pathname of the | 1091 | Specifies the full pathname of the |
1058 | .Xr xauth 1 | 1092 | .Xr xauth 1 |