summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-12-02 23:05:09 +1100
committerDarren Tucker <dtucker@zip.com.au>2007-12-02 23:05:09 +1100
commita93cadd3d41c9b102c46da8da8a95abc3974afe4 (patch)
tree2c82ab9edf042489e2ba0a515cd2fb2f5f0db143
parent2f8b3d9855be2cd6a43d32d7b1799ca415f19f1c (diff)
- dtucker@cvs.openbsd.org 2007/10/29 06:51:59
[ssh_config.5] ProxyCommand and LocalCommand use the user's shell, not /bin/sh; ok djm@
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.58
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 31ffeaec5..2f7b5d0b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
17 Send config block back to slave for invalid users too so options 17 Send config block back to slave for invalid users too so options
18 set by a Match block (eg Banner) behave the same for non-existent 18 set by a Match block (eg Banner) behave the same for non-existent
19 users. Found by and ok djm@ 19 users. Found by and ok djm@
20 - dtucker@cvs.openbsd.org 2007/10/29 06:51:59
21 [ssh_config.5]
22 ProxyCommand and LocalCommand use the user's shell, not /bin/sh; ok djm@
20 23
2120071030 2420071030
22 - (djm) OpenBSD CVS Sync 25 - (djm) OpenBSD CVS Sync
@@ -3434,4 +3437,4 @@
3434 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3437 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3435 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3438 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3436 3439
3437$Id: ChangeLog,v 1.4799 2007/12/02 12:02:15 dtucker Exp $ 3440$Id: ChangeLog,v 1.4800 2007/12/02 12:05:09 dtucker Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 1a313d46a..3535d9f97 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.103 2007/09/21 03:05:23 djm Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.104 2007/10/29 06:51:59 dtucker Exp $
38.Dd $Mdocdate: September 21 2007 $ 38.Dd $Mdocdate: October 29 2007 $
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -599,7 +599,7 @@ and
599Specifies a command to execute on the local machine after successfully 599Specifies a command to execute on the local machine after successfully
600connecting to the server. 600connecting to the server.
601The command string extends to the end of the line, and is executed with 601The command string extends to the end of the line, and is executed with
602.Pa /bin/sh . 602the user's shell .
603This directive is ignored unless 603This directive is ignored unless
604.Cm PermitLocalCommand 604.Cm PermitLocalCommand
605has been enabled. 605has been enabled.
@@ -723,7 +723,7 @@ if version 2 is not available.
723Specifies the command to use to connect to the server. 723Specifies the command to use to connect to the server.
724The command 724The command
725string extends to the end of the line, and is executed with 725string extends to the end of the line, and is executed with
726.Pa /bin/sh . 726the user's shell .
727In the command string, 727In the command string,
728.Ql %h 728.Ql %h
729will be substituted by the host name to 729will be substituted by the host name to