summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2007-10-29 06:54:51 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2007-10-29 06:54:51 +0000
commit907d77124a4ca89b0536cb9eb523824da032cb6d (patch)
tree6c0ef3eea4ec0f6d5a769cb67940fcb49c473ca4 /usr.bin
parent2f20df34aea3fc093f88e1655b8a7ccb65eaab4c (diff)
Make LocalCommand work for Protocol 1 too; ok djm@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/ssh.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index 7b00d18c2d5..2e8be6ca954 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.304 2007/10/29 01:55:04 dtucker Exp $ */
+/* $OpenBSD: ssh.c,v 1.305 2007/10/29 06:54:50 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -983,6 +983,11 @@ ssh_session(void)
/* Initiate port forwardings. */
ssh_init_forwarding();
+ /* Execute a local command */
+ if (options.local_command != NULL &&
+ options.permit_local_command)
+ ssh_local_cmd(options.local_command);
+
/* If requested, let ssh continue in the background. */
if (fork_after_authentication_flag)
if (daemon(1, 1) < 0)