===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- src/usr.bin/ssh/sftp.c	2010/09/26 22:26:33	1.129
+++ src/usr.bin/ssh/sftp.c	2010/10/05 05:13:18	1.130
@@ -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>
  *
@@ -246,7 +246,7 @@
 	if (!*args)
 		args = NULL;
 
-	if ((shell = getenv("SHELL")) == NULL)
+	if ((shell = getenv("SHELL")) == NULL || *shell == '\0')
 		shell = _PATH_BSHELL;
 
 	if ((pid = fork()) == -1)