diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ssh_config.5 | 11 |
2 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,10 @@ | |||
1 | 20140709 | ||
2 | - OpenBSD CVS Sync | ||
3 | - djm@cvs.openbsd.org 2014/07/07 08:19:12 | ||
4 | [ssh_config.5] | ||
5 | mention that ProxyCommand is executed using shell "exec" to avoid | ||
6 | a lingering process; bz#1977 | ||
7 | |||
1 | 20140706 | 8 | 20140706 |
2 | - OpenBSD CVS Sync | 9 | - OpenBSD CVS Sync |
3 | - djm@cvs.openbsd.org 2014/07/03 23:18:35 | 10 | - djm@cvs.openbsd.org 2014/07/03 23:18:35 |
diff --git a/ssh_config.5 b/ssh_config.5 index 81b20aa09..71b9bdcc5 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh_config.5,v 1.189 2014/07/03 07:45:27 jmc Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.190 2014/07/07 08:19:12 djm Exp $ |
37 | .Dd $Mdocdate: July 3 2014 $ | 37 | .Dd $Mdocdate: July 7 2014 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -1086,8 +1086,11 @@ The default is | |||
1086 | .It Cm ProxyCommand | 1086 | .It Cm ProxyCommand |
1087 | Specifies the command to use to connect to the server. | 1087 | Specifies the command to use to connect to the server. |
1088 | The command | 1088 | The command |
1089 | string extends to the end of the line, and is executed with | 1089 | string extends to the end of the line, and is executed |
1090 | the user's shell. | 1090 | using the user's shell |
1091 | .Ql exec | ||
1092 | directive to avoid a lingering shell process. | ||
1093 | .Pp | ||
1091 | In the command string, any occurrence of | 1094 | In the command string, any occurrence of |
1092 | .Ql %h | 1095 | .Ql %h |
1093 | will be substituted by the host name to | 1096 | will be substituted by the host name to |