summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2000-08-28 20:19:52 +0000
committermarkus <markus@openbsd.org>2000-08-28 20:19:52 +0000
commit34503ecda3948b0d9c7b500e7fc0b4382def16be (patch)
tree4bf326f837f9d86cc9bbef559ad149526603a96d /usr.bin/ssh/ssh.c
parentenable -n and -f for ssh2 (diff)
downloadwireguard-openbsd-34503ecda3948b0d9c7b500e7fc0b4382def16be.tar.xz
wireguard-openbsd-34503ecda3948b0d9c7b500e7fc0b4382def16be.zip
allow combination of -N and -f
Diffstat (limited to 'usr.bin/ssh/ssh.c')
-rw-r--r--usr.bin/ssh/ssh.c4
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. */