nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

Better yet, look for sftp-server on the user's PATH as well, which

Browse Source 
allows individual users with shell access to install it without
reference to the admin.

[originally from svn r1229]
This commit is contained in:
Simon Tatham 2001-09-05 19:58:25 +00:00
parent cb1aa5d0f3
commit 6dacf35120
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
psftp.c
View File

@ -1513,26 +1513,23 @@ int main(int argc, char *argv[])
* Set up fallback option, for SSH1 servers or servers with the * Set up fallback option, for SSH1 servers or servers with the
* sftp subsystem not enabled but the server binary installed * sftp subsystem not enabled but the server binary installed
* in the usual place. We only support fallback on Unix * in the usual place. We only support fallback on Unix
* systems, and we use the kludgy command string * systems, and we use a kludgy piece of shellery which should
* try to find sftp-server in various places (the obvious
* systemwide spots /usr/lib and /usr/local/lib, and then the
* user's PATH) and finally give up.
* *
* if test ! -x /usr/lib/sftp-server -a -x /usr/local/lib/sftp-server * test -x /usr/lib/sftp-server && exec /usr/lib/sftp-server
* then * test -x /usr/local/lib/sftp-server && exec /usr/local/lib/sftp-server
* exec /usr/local/lib/sftp-server * exec sftp-server
* else
* exec /usr/lib/sftp-server
* fi
* *
* the idea being that this will attempt to use either of the * the idea being that this will attempt to use either of the
* obvious pathnames and then give up, and when it does give up * obvious pathnames and then give up, and when it does give up
* it will print the preferred pathname in the error messages. * it will print the preferred pathname in the error messages.
*/ */
cfg.remote_cmd_ptr2 = cfg.remote_cmd_ptr2 =
"if test ! -x /usr/lib/sftp-server -a -x /usr/local/lib/sftp-server\n" "test -x /usr/lib/sftp-server && exec /usr/lib/sftp-server\n"
"then\n" "test -x /usr/local/lib/sftp-server && exec /usr/local/lib/sftp-server\n"
" exec /usr/local/lib/sftp-server\n" "exec sftp-server";
"else\n"
" exec /usr/lib/sftp-server\n"
"fi";
cfg.ssh_subsys2 = FALSE; cfg.ssh_subsys2 = FALSE;
back = &ssh_backend; back = &ssh_backend;