diff options
| author |   djm <djm@openbsd.org> | 2010-10-05 05:13:18 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2010-10-05 05:13:18 +0000 |
| commit | 60621398f7661a368a640465d4b69c4b6ef3b76f (patch) | |
| tree | 695df353e3e51da472565da3ebcdba99595712a1 /usr.bin/ssh/sshconnect.c | |
| parent | Our make already uses sh -e when executing commands. (diff) | |
| download | wireguard-openbsd-60621398f7661a368a640465d4b69c4b6ef3b76f.tar.xz wireguard-openbsd-60621398f7661a368a640465d4b69c4b6ef3b76f.zip | |
use default shell /bin/sh if $SHELL is ""; ok markus@
Diffstat (limited to 'usr.bin/ssh/sshconnect.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index 36b874ec218..540e685d997 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.225 2010/08/31 11:54:45 djm Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.226 2010/10/05 05:13:18 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -78,7 +78,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command) pid_t pid; char *shell, strport[NI_MAXSERV]; - if ((shell = getenv("SHELL")) == NULL) + if ((shell = getenv("SHELL")) == NULL || *shell == '\0') shell = _PATH_BSHELL; /* Convert the port number into a string. */ @@ -1224,7 +1224,7 @@ ssh_local_cmd(const char *args) args == NULL || !*args) return (1); - if ((shell = getenv("SHELL")) == NULL) + if ((shell = getenv("SHELL")) == NULL || *shell == '\0') shell = _PATH_BSHELL; pid = fork(); |