v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

Bug fix on the cmdline (clear the entire argv)

Browse Source
This commit is contained in:
Nicolas Viennot 2013-06-14 03:01:12 -04:00
parent 2e69b5c692
commit 12d02afd1b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tmate-slave.c
View File

@ -6,6 +6,7 @@
#include <errno.h> #include <errno.h>
#include <grp.h> #include <grp.h>
#include <pwd.h> #include <pwd.h>
#include <unistd.h>
#ifdef HAVE_CURSES_H #ifdef HAVE_CURSES_H
#include <curses.h> #include <curses.h>
#else #else
@ -19,6 +20,7 @@ int tmux_socket_fd;
const char *tmate_session_token = "main"; const char *tmate_session_token = "main";
static char *cmdline; static char *cmdline;
static char *cmdline_end;
extern FILE *log_file; extern FILE *log_file;
extern int server_create_socket(void); extern int server_create_socket(void);
@ -29,7 +31,7 @@ static void usage(void)
fprintf(stderr, "usage: tmate-slave [-k keys_dir] [-l logfile] [-p PORT] [-v]\n"); fprintf(stderr, "usage: tmate-slave [-k keys_dir] [-l logfile] [-p PORT] [-v]\n");
} }
int main(int argc, char **argv) int main(int argc, char **argv, char **envp)
{ {
int opt; int opt;
int port = TMATE_DEFAULT_PORT; int port = TMATE_DEFAULT_PORT;
@ -57,6 +59,7 @@ int main(int argc, char **argv)
} }
cmdline = *argv; cmdline = *argv;
cmdline_end = *envp;
log_open(debug_level, log_path); log_open(debug_level, log_path);
@ -77,6 +80,7 @@ static void set_session_token(struct tmate_ssh_client *client,
strcpy(socket_path, TMATE_WORKDIR "/sessions/"); strcpy(socket_path, TMATE_WORKDIR "/sessions/");
strcat(socket_path, token); strcat(socket_path, token);
memset(cmdline, 0, cmdline_end - cmdline);
sprintf(cmdline, "tmate-slave [%s] %s %s", sprintf(cmdline, "tmate-slave [%s] %s %s",
tmate_session_token, tmate_session_token,
client->ip_address, client->ip_address,