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

sshd changes

Browse Source
This commit is contained in:
Manoj Ampalam 2016-03-25 16:28:25 -07:00
parent d5eefe3c08
commit 31989d6f07
3 changed files with 13 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
serverloop.c
View File

@ -37,15 +37,6 @@
#include "includes.h" #include "includes.h"
/*
* We support only client side kerberos on Windows.
*/
#ifdef WIN32_FIXME
#undef GSSAPI
#undef KRB5
#endif
#include <sys/param.h> /* MIN MAX */ #include <sys/param.h> /* MIN MAX */
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
@ -90,10 +81,6 @@
#include "roaming.h" #include "roaming.h"
#include "ssherr.h" #include "ssherr.h"
#ifdef WIN32_FIXME
//#define isatty(a) WSHELPisatty(a)
#endif
extern ServerOptions options; extern ServerOptions options;
/* XXX */ /* XXX */
@ -583,7 +570,6 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
int type; int type;
debug("Entering interactive session."); debug("Entering interactive session.");
#ifndef WIN32_FIXME
/* Initialize the SIGCHLD kludge. */ /* Initialize the SIGCHLD kludge. */
child_terminated = 0; child_terminated = 0;
mysignal(SIGCHLD, sigchld_handler); mysignal(SIGCHLD, sigchld_handler);
@ -593,7 +579,6 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
signal(SIGINT, sigterm_handler); signal(SIGINT, sigterm_handler);
signal(SIGQUIT, sigterm_handler); signal(SIGQUIT, sigterm_handler);
} }
#endif
/* Initialize our global variables. */ /* Initialize our global variables. */
fdin = fdin_arg; fdin = fdin_arg;
@ -767,7 +752,6 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
fdin = -1; fdin = -1;
channel_free_all(); channel_free_all();
#ifndef WIN32_FIXME
/* We no longer want our SIGCHLD handler to be called. */ /* We no longer want our SIGCHLD handler to be called. */
mysignal(SIGCHLD, SIG_DFL); mysignal(SIGCHLD, SIG_DFL);
@ -778,13 +762,6 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
if (wait_pid != pid) if (wait_pid != pid)
error("Strange, wait returned pid %ld, expected %ld", error("Strange, wait returned pid %ld, expected %ld",
(long)wait_pid, (long)pid); (long)wait_pid, (long)pid);
#else
if (WaitForSingleObject(pid, 0) == 0) {
wait_status = 0;
} else {
packet_disconnect("wait: %d", GetLastError());
}
#endif
/* Check if it exited normally. */ /* Check if it exited normally. */
if (WIFEXITED(wait_status)) { if (WIFEXITED(wait_status)) {
@ -820,19 +797,9 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
/* NOTREACHED */ /* NOTREACHED */
} }
#ifdef WIN32_FIXME
Session * session_get(int *);
#endif
static void static void
collect_children(void) collect_children(void)
{ {
#ifndef WIN32_FIXME
/*
* Original OpenSSH code.
*/
pid_t pid; pid_t pid;
sigset_t oset, nset; sigset_t oset, nset;
int status; int status;
@ -850,43 +817,6 @@ collect_children(void)
child_terminated = 0; child_terminated = 0;
} }
sigprocmask(SIG_SETMASK, &oset, NULL); sigprocmask(SIG_SETMASK, &oset, NULL);
#else
/*
* Win32 code.
*/
HANDLE process;
int status = 0;
int i = 0;
Session *s;
do
{
s = session_get(&i);
if ((s != NULL) && (s->pid != 0))
{
if (WaitForSingleObject(s -> pid, 0) == 0)
{
debug("Received SIGCHLD.");
process = s->pid;
session_close_by_pid(s->pid, status);
sw_remove_child(process);
}
}
} while (i > 0);
child_terminated = 0;
#endif
} }
void void

7
session.c
View File

@ -38,13 +38,6 @@
* We support only client side kerberos on Windows. * We support only client side kerberos on Windows.
*/ */
#ifdef WIN32_FIXME
#undef GSSAPI
#undef KRB5
#define WIN32_USER_AUTH 1
//#define WIN32_PRAGMA_REMCON
#endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
#ifdef HAVE_SYS_STAT_H #ifdef HAVE_SYS_STAT_H

183
sshd.c
View File

@ -44,15 +44,6 @@
#include "includes.h" #include "includes.h"
/*
* We support only client side kerberos on Windows.
*/
#ifdef WIN32_FIXME
#undef GSSAPI
#undef KRB5
#endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -183,18 +174,6 @@ int log_stderr = 0;
char **saved_argv; char **saved_argv;
int saved_argc; int saved_argc;
/* Arguments to used for fake forked child processes of sshd.exe */
#ifdef WIN32_FIXME
/*
FIXME: GFPZR: Function stat() may be undeclared.
*/
#include <sys/stat.h>
#include <tlhelp32.h>
char *fake_fork_args;
#endif
/* re-exec */ /* re-exec */
int rexeced_flag = 0; int rexeced_flag = 0;
int rexec_flag = 1; int rexec_flag = 1;
@ -308,22 +287,17 @@ static void do_ssh2_kex(void);
#ifdef WIN32_FIXME #ifdef WIN32_FIXME
if (GetModuleFileName(NULL, path, pathSize)) if (GetModuleFileName(NULL, path, pathSize)){
{
int i; int i;
int lastSlashPos = 0; int lastSlashPos = 0;
for (i = 0; path[i]; i++) for (i = 0; path[i]; i++) {
{ if (path[i] == '/' || path[i] == '\\') {
if (path[i] == '/' || path[i] == '\\') lastSlashPos = i;
{ }
lastSlashPos = i; }
}
}
path[lastSlashPos] = 0; path[lastSlashPos] = 0;
exitCode = 0; exitCode = 0;
} }
@ -358,7 +332,6 @@ static void do_ssh2_kex(void);
} }
#ifdef WIN32_FIXME #ifdef WIN32_FIXME
/* /*
* Win32 only. * Win32 only.
*/ */
@ -423,26 +396,9 @@ static void do_ssh2_kex(void);
debug("SERVICE_CONTROL_STOP signal received..."); debug("SERVICE_CONTROL_STOP signal received...");
ReportSvcStatus(SERVICE_STOP_PENDING, NO_ERROR, 500); ReportSvcStatus(SERVICE_STOP_PENDING, NO_ERROR, 500);
/*
* Send exit signal to child 'sshd.exe' processes.
*/
/*
FIXME: Group childs in job to isolate childs from parent.
Reason: childs should be killed by sending SIGBRK, but
parent (this service) should NOT.
debug("Sending exit signal to child 'sshd.exe' processes..."); raise(SIGINT);
/*TODO - wait for main thread to unwind */
if (!GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, 0))
{
debug("ERROR: Cannot send exit signal to childs (%u).\n", GetLastError());
}
*/
/*
* Signal the service to stop.
*/
ReportSvcStatus(SERVICE_STOPPED, NO_ERROR, 0); ReportSvcStatus(SERVICE_STOPPED, NO_ERROR, 0);
return; return;
@ -466,96 +422,6 @@ static void do_ssh2_kex(void);
ReportSvcStatus(gSvcStatus.dwCurrentState, NO_ERROR, 0); ReportSvcStatus(gSvcStatus.dwCurrentState, NO_ERROR, 0);
} }
static VOID SvcUninstall()
{
SC_HANDLE schSCManager;
SC_HANDLE schService;
/*
* Get a handle to the SCM database.
*/
schSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
if (NULL == schSCManager)
{
printf("OpenSCManager failed (%d)\n", GetLastError());
return;
}
schService = OpenService(schSCManager, SVCNAME, DELETE);
if (NULL == schService)
{
printf("OpenService failed (%d)\n", GetLastError());
return;
}
if (!DeleteService(schService))
{
printf("DeleteService failed (%d)\n", GetLastError());
return;
}
printf("Service (%s) deleted.", SVCNAME);
}
static VOID SvcInstall()
{
SC_HANDLE schSCManager;
SC_HANDLE schService;
TCHAR szPath[MAX_PATH];
if(GetModuleFileName(NULL, szPath, MAX_PATH) == FALSE)
{
printf("Cannot install service (%d)\n", GetLastError());
return;
}
/*
* Get a handle to the SCM database.
*/
schSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
if (NULL == schSCManager)
{
printf("OpenSCManager failed (%d)\n", GetLastError());
return;
}
/*
* Create the service
*/
schService = CreateService(schSCManager, SVCNAME, SVCNAME, SERVICE_ALL_ACCESS,
SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START,
SERVICE_ERROR_NORMAL, szPath, NULL, NULL,
NULL, NULL, NULL);
if (schService == NULL)
{
printf("CreateService failed (%d)\n", GetLastError());
CloseServiceHandle(schSCManager);
return;
}
else
{
printf("Service installed successfully\n");
}
CloseServiceHandle(schService);
CloseServiceHandle(schSCManager);
}
#endif /* WIN32_FIXME */ #endif /* WIN32_FIXME */
@ -594,13 +460,11 @@ close_startup_pipes(void)
static void static void
sighup_handler(int sig) sighup_handler(int sig)
{ {
#ifndef WIN32_FIXME
int save_errno = errno; int save_errno = errno;
received_sighup = 1; received_sighup = 1;
signal(SIGHUP, sighup_handler); signal(SIGHUP, sighup_handler);
errno = save_errno; errno = save_errno;
#endif
} }
/* /*
@ -610,7 +474,6 @@ sighup_handler(int sig)
static void static void
sighup_restart(void) sighup_restart(void)
{ {
#ifndef WIN32_FIXME
logit("Received SIGHUP; restarting."); logit("Received SIGHUP; restarting.");
platform_pre_restart(); platform_pre_restart();
close_listen_socks(); close_listen_socks();
@ -621,7 +484,6 @@ sighup_restart(void)
logit("RESTART FAILED: av[0]='%.100s', error: %.100s.", saved_argv[0], logit("RESTART FAILED: av[0]='%.100s', error: %.100s.", saved_argv[0],
strerror(errno)); strerror(errno));
exit(1); exit(1);
#endif
} }
/* /*
@ -642,7 +504,6 @@ sigterm_handler(int sig)
static void static void
main_sigchld_handler(int sig) main_sigchld_handler(int sig)
{ {
#ifndef WIN32_FIXME
int save_errno = errno; int save_errno = errno;
pid_t pid; pid_t pid;
int status; int status;
@ -653,7 +514,6 @@ main_sigchld_handler(int sig)
signal(SIGCHLD, main_sigchld_handler); signal(SIGCHLD, main_sigchld_handler);
errno = save_errno; errno = save_errno;
#endif
} }
/* /*
@ -663,7 +523,6 @@ main_sigchld_handler(int sig)
static void static void
grace_alarm_handler(int sig) grace_alarm_handler(int sig)
{ {
#ifndef WIN32_FIXME
if (use_privsep && pmonitor != NULL && pmonitor->m_pid > 0) if (use_privsep && pmonitor != NULL && pmonitor->m_pid > 0)
kill(pmonitor->m_pid, SIGALRM); kill(pmonitor->m_pid, SIGALRM);
@ -678,7 +537,6 @@ grace_alarm_handler(int sig)
/* Log error and exit. */ /* Log error and exit. */
sigdie("Timeout before authentication for %s", get_remote_ipaddr()); sigdie("Timeout before authentication for %s", get_remote_ipaddr());
#endif
} }
/* /*
@ -1528,13 +1386,8 @@ server_listen(void)
/* /*
* Forbid inheriting of listen socket. * Forbid inheriting of listen socket.
*/ */
fcntl(listen_sock, F_SETFD, FD_CLOEXEC);
if (SetHandleInformation(sfd_to_handle(listen_sock),
HANDLE_FLAG_INHERIT, 0) == FALSE)
{
debug("ERROR: Cannot clear inherit flag from listen socket [%d]. "
"Error code : %u.", listen_sock, GetLastError());
}
#endif #endif
@ -1598,14 +1451,9 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
sighup_restart(); sighup_restart();
if (fdset != NULL) if (fdset != NULL)
free(fdset); free(fdset);
#if(1)//ndef WIN32_FIXME
fdset = xcalloc(howmany(maxfd + 1, NFDBITS), fdset = xcalloc(howmany(maxfd + 1, NFDBITS),
sizeof(fd_mask)); sizeof(fd_mask));
#else
fdset = (fd_set *) xmalloc(sizeof(fd_set));
FD_ZERO(fdset);
#endif
for (i = 0; i < num_listen_socks; i++) for (i = 0; i < num_listen_socks; i++)
FD_SET(listen_socks[i], fdset); FD_SET(listen_socks[i], fdset);
@ -1671,7 +1519,7 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
close(*newsock); close(*newsock);
continue; continue;
} }
#ifndef WIN32_FIXME
if (pipe(startup_p) == -1) { if (pipe(startup_p) == -1) {
close(*newsock); close(*newsock);
continue; continue;
@ -1686,7 +1534,7 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
close(startup_p[1]); close(startup_p[1]);
continue; continue;
} }
#endif
for (j = 0; j < options.max_startups; j++) for (j = 0; j < options.max_startups; j++)
if (startup_pipes[j] == -1) { if (startup_pipes[j] == -1) {
startup_pipes[j] = startup_p[0]; startup_pipes[j] = startup_p[0];
@ -1786,11 +1634,6 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
} }
#else #else
/*
* Original OpenSSH code.
*/
/* /*
* Normal production daemon. Fork, and have * Normal production daemon. Fork, and have