summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ssh_config.511
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 35c116484..712a9caf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,10 @@
39 - jmc@cvs.openbsd.org 2009/10/28 21:45:08 39 - jmc@cvs.openbsd.org 2009/10/28 21:45:08
40 [sshd_config.5 sftp.1] 40 [sshd_config.5 sftp.1]
41 tweak previous; 41 tweak previous;
42 - djm@cvs.openbsd.org 2009/11/10 02:56:22
43 [ssh_config.5]
44 explain the constraints on LocalCommand some more so people don't
45 try to abuse it.
42 46
4320091226 4720091226
44 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 48 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1
diff --git a/ssh_config.5 b/ssh_config.5
index fde899477..001130936 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.122 2009/10/28 16:38:18 reyk Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.123 2009/11/10 02:56:22 djm Exp $
38.Dd $Mdocdate: October 28 2009 $ 38.Dd $Mdocdate: November 10 2009 $
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -616,6 +616,13 @@ The following escape character substitutions will be performed:
616(remote user name) or 616(remote user name) or
617.Ql %u 617.Ql %u
618(local user name). 618(local user name).
619.Pp
620The command is run synchronously and does not have access to the
621session of the
622.Xr ssh 1
623that spawned it.
624It should not be used for interactive commands.
625.Pp
619This directive is ignored unless 626This directive is ignored unless
620.Cm PermitLocalCommand 627.Cm PermitLocalCommand
621has been enabled. 628has been enabled.