- dtucker@cvs.openbsd.org 2007/10/29 06:54:50
[ssh.c]
Make LocalCommand work for Protocol 1 too; ok djm@
diff --git a/ChangeLog b/ChangeLog
index 2f7b5d0..818d718 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
- 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@
+ - dtucker@cvs.openbsd.org 2007/10/29 06:54:50
+ [ssh.c]
+ Make LocalCommand work for Protocol 1 too; ok djm@
20071030
- (djm) OpenBSD CVS Sync
@@ -3437,4 +3440,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4800 2007/12/02 12:05:09 dtucker Exp $
+$Id: ChangeLog,v 1.4801 2007/12/02 12:06:35 dtucker Exp $
diff --git a/ssh.c b/ssh.c
index 802ba68..3653218 100644
--- a/ssh.c
+++ b/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
@@ -1002,6 +1002,11 @@
/* 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)