tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-07-21 21:14:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

ssh-agent launched interactive will now automatically start ssh-agent service.

Browse Source 
This is to support Linux scenarios.
This commit is contained in:
manojampalam 2016-07-07 14:14:15 -07:00
parent f5e6d88da1
commit 481e403518
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
contrib/win32/win32compat/ssh-agent/agent-main.c
View File

@ -96,21 +96,45 @@ int main(int argc, char **argv) {
load_config(); load_config();
if (!StartServiceCtrlDispatcherW(dispatch_table)) { if (!StartServiceCtrlDispatcherW(dispatch_table)) {
if (GetLastError() == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) { if (GetLastError() == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) {
if (argc == 1) { /*todo - support debug mode*/
/* console app - start in debug mode*/ /*
if (debugmode) {
SetConsoleCtrlHandler(ctrl_c_handler, TRUE); SetConsoleCtrlHandler(ctrl_c_handler, TRUE);
log_init("ssh-agent", 7, 1, 1); log_init("ssh-agent", 7, 1, 1);
agent_start(TRUE, FALSE, 0, 0); agent_start(TRUE, FALSE, 0, 0);
return 0; return 0;
} }
else { */
if (argc == 2) {
/*agent process is likely a spawned child*/
char* h = 0; char* h = 0;
h += atoi(*(argv + 1)); h += atoi(*(argv + 1));
if (h != 0) {
log_init("ssh-agent", config_log_level(), 1, 0); log_init("ssh-agent", config_log_level(), 1, 0);
agent_start(FALSE, TRUE, h, atoi(*(argv + 2))); agent_start(FALSE, TRUE, h, atoi(*(argv + 2)));
return 0; return 0;
} }
} }
/* to support linux compat scenarios where ssh-agent.exe is typically launched per session*/
/* - just start ssh-agent service if needed */
{
SC_HANDLE sc_handle, svc_handle;
DWORD err;
if ((sc_handle = OpenSCManagerW(NULL, NULL, SERVICE_START)) == NULL ||
(svc_handle = OpenServiceW(sc_handle, L"ssh-agent", SERVICE_START)) == NULL){
fatal("unable to open service handle");
return -1;
}
if (StartService(svc_handle, 0, NULL) == FALSE && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) {
fatal("unable to start ssh-agent service, error :%d", GetLastError());
return -1;
}
return 0;
}
}
else else
return -1; return -1;
} }