summaryrefslogtreecommitdiffstats
path: root/sftp.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-10-07 13:07:11 +0200
committerDamien Miller <djm@mindrot.org>2010-10-07 13:07:11 +0200
commit38d9a965bfc795fba1c000e0b42e705e2bcd34c9 (patch)
treed21fcf058b9c991de5c08ef4df8e0a548963765c /sftp.c
parent - djm@cvs.openbsd.org 2010/10/01 23:05:32 (diff)
downloadopenssh-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 'sftp.c')
-rw-r--r--sftp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sftp.c b/sftp.c
index 7b4a85235..1421fcb02 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.129 2010/09/26 22:26:33 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.130 2010/10/05 05:13:18 djm Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
*
@@ -269,7 +269,7 @@ local_do_shell(const char *args)
if (!*args)
args = NULL;
- if ((shell = getenv("SHELL")) == NULL)
+ if ((shell = getenv("SHELL")) == NULL || *shell == '\0')
shell = _PATH_BSHELL;
if ((pid = fork()) == -1)