tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 15:54:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[sftp.c sshconnect.c]
     use default shell /bin/sh if $SHELL is ""; ok markus@
This commit is contained in:
Damien Miller 2010-10-07 22:07:11 +11:00
parent 9a3d0dc062
commit 38d9a965bf
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -27,6 +27,9 @@
[cipher-3des1.c cipher-bf1.c cipher-ctr.c openbsd-compat/openssl-compat.h] [cipher-3des1.c cipher-bf1.c cipher-ctr.c openbsd-compat/openssl-compat.h]
adapt to API changes in openssl-1.0.0a adapt to API changes in openssl-1.0.0a
NB. contains compat code to select correct API for older OpenSSL 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 20100924
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync

4
sftp.c
View File

@ -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> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -269,7 +269,7 @@ local_do_shell(const char *args)
if (!*args) if (!*args)
args = NULL; args = NULL;
if ((shell = getenv("SHELL")) == NULL) if ((shell = getenv("SHELL")) == NULL || *shell == '\0')
shell = _PATH_BSHELL; shell = _PATH_BSHELL;
if ((pid = fork()) == -1) if ((pid = fork()) == -1)

6
sshconnect.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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; pid_t pid;
char *shell, strport[NI_MAXSERV]; char *shell, strport[NI_MAXSERV];
if ((shell = getenv("SHELL")) == NULL) if ((shell = getenv("SHELL")) == NULL || *shell == '\0')
shell = _PATH_BSHELL; shell = _PATH_BSHELL;
/* Convert the port number into a string. */ /* Convert the port number into a string. */
@ -1237,7 +1237,7 @@ ssh_local_cmd(const char *args)
args == NULL || !*args) args == NULL || !*args)
return (1); return (1);
if ((shell = getenv("SHELL")) == NULL) if ((shell = getenv("SHELL")) == NULL || *shell == '\0')
shell = _PATH_BSHELL; shell = _PATH_BSHELL;
pid = fork(); pid = fork();