diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.c | 7 |
2 files changed, 10 insertions, 2 deletions
@@ -20,6 +20,9 @@ | |||
20 | - dtucker@cvs.openbsd.org 2007/10/29 06:51:59 | 20 | - dtucker@cvs.openbsd.org 2007/10/29 06:51:59 |
21 | [ssh_config.5] | 21 | [ssh_config.5] |
22 | ProxyCommand and LocalCommand use the user's shell, not /bin/sh; ok djm@ | 22 | ProxyCommand and LocalCommand use the user's shell, not /bin/sh; ok djm@ |
23 | - dtucker@cvs.openbsd.org 2007/10/29 06:54:50 | ||
24 | [ssh.c] | ||
25 | Make LocalCommand work for Protocol 1 too; ok djm@ | ||
23 | 26 | ||
24 | 20071030 | 27 | 20071030 |
25 | - (djm) OpenBSD CVS Sync | 28 | - (djm) OpenBSD CVS Sync |
@@ -3437,4 +3440,4 @@ | |||
3437 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3440 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3438 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3441 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3439 | 3442 | ||
3440 | $Id: ChangeLog,v 1.4800 2007/12/02 12:05:09 dtucker Exp $ | 3443 | $Id: ChangeLog,v 1.4801 2007/12/02 12:06:35 dtucker Exp $ |
@@ -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) |