- 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 f11b8592ac1bf8aac055cd9beb628b3bfe07e72b..59a1c8989e50392213f60b90e15070b589cbd880 100644 (file)
--- 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: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
 
 20071030
  - (djm) OpenBSD CVS Sync

diff --git a/ssh.c b/ssh.c
index 802ba6870072e4868cf681c5b28ed5b4f0254d40..365321829f495d09c849119b7221febb94f8760e 100644 (file)
--- 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
 /*
  * 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();
 
        /* 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)
        /* If requested, let ssh continue in the background. */
        if (fork_after_authentication_flag)
                if (daemon(1, 1) < 0)