diff options
| author | Damien Miller <djm@mindrot.org> | 2010-10-07 13:07:11 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-10-07 13:07:11 +0200 |
| commit | 38d9a965bfc795fba1c000e0b42e705e2bcd34c9 (patch) | |
| tree | d21fcf058b9c991de5c08ef4df8e0a548963765c /sshconnect.c | |
| parent | - djm@cvs.openbsd.org 2010/10/01 23:05:32 (diff) | |
| download | openssh-38d9a965bfc795fba1c000e0b42e705e2bcd34c9.tar.xz openssh-38d9a965bfc795fba1c000e0b42e705e2bcd34c9.zip | |
- djm@cvs.openbsd.org 2010/10/05 05:13:18
[sftp.c sshconnect.c]
use default shell /bin/sh if $SHELL is ""; ok markus@
Diffstat (limited to '')
| -rw-r--r-- | sshconnect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sshconnect.c b/sshconnect.c index 4d3a08551..6d2f1341c 100644 --- a/sshconnect.c +++ b/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 @@ -87,7 +87,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. */ @@ -1237,7 +1237,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(); |