diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2000-08-28 20:19:53 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2000-08-28 20:19:53 +0000 |
| commit | d2191e3b6940ab16ed85b4e28d5aae61658e4d05 (patch) | |
| tree | 79a149c71f9e18ba9bdb1de615c7ab7617357e07 /usr.bin | |
| parent | 651ae9ac0357b84164cfaeb2135b7213257cf7c2 (diff) | |
allow combination of -N and -f
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 159c2483c76..3cce8fc77bd 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -11,7 +11,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.62 2000/08/28 19:51:00 markus Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.63 2000/08/28 20:19:52 markus Exp $"); #include <openssl/evp.h> #include <openssl/dsa.h> @@ -451,7 +451,7 @@ main(int ac, char **av) } /* Cannot fork to background if no command. */ - if (fork_after_authentication_flag && buffer_len(&command) == 0) + if (fork_after_authentication_flag && buffer_len(&command) == 0 && !no_shell_flag) fatal("Cannot fork into background without a command to execute."); /* Allocate a tty by default if no command specified. */ |