tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass prompted message to SSH_ASKPASS command line 

Issue: The msg parameter provided to the ssh_askpass function is not forwarded to the command specified by SSH_ASKPASS. This parameter specifies a prompt that should be forwarded as a command line argument to the SSH_ASKPASS-specified command. The logic is correct in the fork-based version but not the posix_spawn-based version of the code.

Fix: Change posix_spawn arguments to include prompt message
This commit is contained in:
Manoj Ampalam 2019-09-12 12:06:03 -07:00 committed by GitHub
parent 9cc51aa7e4
commit 675e761d75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
readpass.c
View File

@ -78,10 +78,11 @@ ssh_askpass(char *askpass, const char *msg)
signal(SIGCHLD, osigchld); signal(SIGCHLD, osigchld);
return NULL; return NULL;
} else { } else {
char* spawn_argv[2]; const char* spawn_argv[3];
spawn_argv[0] = askpass; spawn_argv[0] = askpass;
spawn_argv[1] = NULL; spawn_argv[1] = msg;
if (posix_spawnp(&pid, spawn_argv[0], &actions, NULL, spawn_argv, NULL) != 0) { spawn_argv[2] = NULL;
if (posix_spawnp(&pid, spawn_argv[0], &actions, NULL, (char* const*) spawn_argv, NULL) != 0) {
posix_spawn_file_actions_destroy(&actions); posix_spawn_file_actions_destroy(&actions);
error("ssh_askpass: posix_spawnp: %s", strerror(errno)); error("ssh_askpass: posix_spawnp: %s", strerror(errno));
signal(SIGCHLD, osigchld); signal(SIGCHLD, osigchld);