From b776c856aa086b0e136b858d9484c155cb00a99b Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sun, 2 Dec 2007 23:06:35 +1100 Subject: [PATCH] - dtucker@cvs.openbsd.org 2007/10/29 06:54:50 [ssh.c] Make LocalCommand work for Protocol 1 too; ok djm@ --- ChangeLog | 5 ++++- ssh.c | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f7b5d0b5..818d71834 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 802ba6870..365321829 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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1002,6 +1002,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)