From: dtucker <dtucker>
Date: Sun, 2 Dec 2007 12:06:35 +0000 (+0000)
Subject:    - dtucker@cvs.openbsd.org 2007/10/29 06:54:50
X-Git-Tag: V_4_9_P1~104
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/c80e7e5db9fcf6939a9357514d5b17fadb5de995?ds=sidebyside

   - 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 f11b8592..59a1c898 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
diff --git a/ssh.c b/ssh.c
index 802ba687..36532182 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 @@ 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)