aboutsummaryrefslogtreecommitdiff
path: root/src/server_ssh.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/server_ssh.c')
-rw-r--r--src/server_ssh.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/server_ssh.c b/src/server_ssh.c
index 474b5ab..100c6a8 100644
--- a/src/server_ssh.c
+++ b/src/server_ssh.c
@@ -12,7 +12,6 @@
#include <libssh/server.h>
#include "server_ssh.h"
-#include "jail.h"
#include "log.h"
#if LIBSSH_VERSION_MAJOR != 0 || LIBSSH_VERSION_MINOR < 7 || \
@@ -39,7 +38,7 @@ static void *
ssh_thread_mainloop(void *arg);
static int authenticate(ssh_session session);
static int auth_password(const char *user, const char *password);
-static int main_loop(ssh_channel chan);
+static int client_mainloop(ssh_channel chan);
static int copy_fd_to_chan(socket_t fd, int revents, void *userdata);
static int copy_chan_to_fd(ssh_session session, ssh_channel channel, void *data,
uint32_t len, int is_stderr, void *userdata);
@@ -327,7 +326,7 @@ ssh_thread_mainloop(void *arg)
}
N("%s", "Dropping user into shell");
- main_loop(chan);
+ client_mainloop(chan);
failed:
ssh_disconnect(ses);
@@ -404,7 +403,7 @@ static int auth_password(const char *user, const char *password)
return 1; /* authenticated */
}
-static int main_loop(ssh_channel chan)
+static int client_mainloop(ssh_channel chan)
{
ssh_session session = ssh_channel_get_session(chan);
socket_t fd;
@@ -413,12 +412,6 @@ static int main_loop(ssh_channel chan)
pid_t childpid;
ssh_event event;
short events;
- jail_ctx jail, *jail_ptr = &jail;
-
- jail_init(&jail_ptr, BUFSIZ);
- if (jail_fork(jail_ptr)) {
- E_STRERR("Jail fork");
- }
childpid = forkpty(&fd, NULL, term, win);
if (childpid == 0) {