summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-12-02 23:06:35 +1100
committerDarren Tucker <dtucker@zip.com.au>2007-12-02 23:06:35 +1100
commitb776c856aa086b0e136b858d9484c155cb00a99b (patch)
treeb039d4817b88655390a3a8011e3b98f6e186bc06 /ssh.c
parenta93cadd3d41c9b102c46da8da8a95abc3974afe4 (diff)
- dtucker@cvs.openbsd.org 2007/10/29 06:54:50
[ssh.c] Make LocalCommand work for Protocol 1 too; ok djm@
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/ssh.c b/ssh.c
index 802ba6870..365321829 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.304 2007/10/29 01:55:04 dtucker Exp $ */ 1/* $OpenBSD: ssh.c,v 1.305 2007/10/29 06:54:50 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1002,6 +1002,11 @@ ssh_session(void)
1002 /* Initiate port forwardings. */ 1002 /* Initiate port forwardings. */
1003 ssh_init_forwarding(); 1003 ssh_init_forwarding();
1004 1004
1005 /* Execute a local command */
1006 if (options.local_command != NULL &&
1007 options.permit_local_command)
1008 ssh_local_cmd(options.local_command);
1009
1005 /* If requested, let ssh continue in the background. */ 1010 /* If requested, let ssh continue in the background. */
1006 if (fork_after_authentication_flag) 1011 if (fork_after_authentication_flag)
1007 if (daemon(1, 1) < 0) 1012 if (daemon(1, 1) < 0)