- djm@cvs.openbsd.org 2010/10/05 05:13:18

     [sftp.c sshconnect.c]
     use default shell /bin/sh if $SHELL is ""; ok markus@

diff --git a/ChangeLog b/ChangeLog
index 9628478e790521a5d5f1b942f16975a7d233974d..f5253a431d695d24badc9619ca66eaa7ed2aadc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@
      [cipher-3des1.c cipher-bf1.c cipher-ctr.c openbsd-compat/openssl-compat.h]
      adapt to API changes in openssl-1.0.0a
      NB. contains compat code to select correct API for older OpenSSL
+   - djm@cvs.openbsd.org 2010/10/05 05:13:18
+     [sftp.c sshconnect.c]
+     use default shell /bin/sh if $SHELL is ""; ok markus@
 
 20100924
  - (djm) OpenBSD CVS Sync

diff --git a/sftp.c b/sftp.c
index 7b4a852353e986b8d845e56e8f1615082e908b47..1421fcb02b5636e3919dce2044b3b5ae20b7d450 100644 (file)
--- 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)

diff --git a/sshconnect.c b/sshconnect.c
index 4d3a08551f242f6b823d871a134389b2dda2e9d1..6d2f1341c52f36fa392d4a5c36f9f78ccd552f93 100644 (file)
--- 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();