diff options
-rw-r--r-- | plugins/rdp/rdp_plugin.c | 1 | ||||
-rw-r--r-- | src/remmina_exec.c | 2 | ||||
-rw-r--r-- | src/remmina_file_editor.c | 2 | ||||
-rw-r--r-- | src/remmina_ftp_client.c | 4 | ||||
-rw-r--r-- | src/remmina_log.c | 6 | ||||
-rw-r--r-- | src/remmina_monitor.c | 2 | ||||
-rw-r--r-- | src/remmina_protocol_widget.c | 2 | ||||
-rw-r--r-- | src/remmina_ssh.c | 12 | ||||
-rw-r--r-- | src/remmina_ssh.h | 1 | ||||
-rw-r--r-- | src/remmina_ssh_plugin.c | 2 |
10 files changed, 21 insertions, 13 deletions
diff --git a/plugins/rdp/rdp_plugin.c b/plugins/rdp/rdp_plugin.c index 01354f67e..ea7779922 100644 --- a/plugins/rdp/rdp_plugin.c +++ b/plugins/rdp/rdp_plugin.c @@ -49,6 +49,7 @@ #include <errno.h> #include <pthread.h> #include <time.h> +#include <sys/time.h> #include <cairo/cairo-xlib.h> #include <freerdp/addin.h> #include <freerdp/settings.h> diff --git a/src/remmina_exec.c b/src/remmina_exec.c index 49218e777..bc6067edf 100644 --- a/src/remmina_exec.c +++ b/src/remmina_exec.c @@ -168,7 +168,7 @@ int remmina_exec_set_setting(gchar *profilefilename, gchar **settings) { RemminaFile *remminafile; int i; - gchar **tk, *value; + gchar **tk, *value = NULL; char *line = NULL; size_t len = 0; ssize_t read; diff --git a/src/remmina_file_editor.c b/src/remmina_file_editor.c index 33ffbcf5d..dbc3df6fc 100644 --- a/src/remmina_file_editor.c +++ b/src/remmina_file_editor.c @@ -1103,6 +1103,7 @@ static void remmina_file_editor_create_behavior_tab(RemminaFileEditor *gfe) remmina_file_get_int(priv->remmina_file, "profile-lock", FALSE), "profile-lock"); } +#ifdef HAVE_LIBSSH static gpointer ssh_tunnel_auth_list[] = { "0", N_("Password"), @@ -1112,6 +1113,7 @@ static gpointer ssh_tunnel_auth_list[] = "4", N_("Kerberos (GSSAPI)"), NULL }; +#endif static void remmina_file_editor_create_ssh_tunnel_tab(RemminaFileEditor *gfe, RemminaProtocolSSHSetting ssh_setting) { diff --git a/src/remmina_ftp_client.c b/src/remmina_ftp_client.c index 82bff4e7f..3002a0fc1 100644 --- a/src/remmina_ftp_client.c +++ b/src/remmina_ftp_client.c @@ -1193,7 +1193,11 @@ remmina_ftp_client_get_waiting_task(RemminaFTPClient *client) path = gtk_tree_model_get_path(priv->task_list_model, &iter); task.rowref = gtk_tree_row_reference_new(priv->task_list_model, path); gtk_tree_path_free(path); +#if GLIB_CHECK_VERSION(2,68,0) + return (RemminaFTPTask*)g_memdup2(&task, sizeof(RemminaFTPTask)); +#else return (RemminaFTPTask*)g_memdup(&task, sizeof(RemminaFTPTask)); +#endif } if (!gtk_tree_model_iter_next(priv->task_list_model, &iter)) break; diff --git a/src/remmina_log.c b/src/remmina_log.c index f9b9ff397..e1bef0f2e 100644 --- a/src/remmina_log.c +++ b/src/remmina_log.c @@ -317,9 +317,9 @@ void _remmina_audit(const gchar *fun, const gchar *fmt, ...) gchar *text = g_strdup_vprintf(fmt, args); va_end(args); - GTimeVal tv; - g_get_current_time(&tv); - gchar *isodate = g_time_val_to_iso8601(&tv); + GDateTime* tv = g_date_time_new_now_local(); + gchar *isodate = g_date_time_format_iso8601(tv); + g_date_time_unref(tv); g_autofree gchar *buf = g_strdup(""); diff --git a/src/remmina_monitor.c b/src/remmina_monitor.c index 6ea00e700..9c1c858b9 100644 --- a/src/remmina_monitor.c +++ b/src/remmina_monitor.c @@ -80,7 +80,7 @@ gchar *remmina_monitor_can_reach(RemminaFile *remminafile, RemminaMonitor *monit const gchar *server; const gchar *ssh_tunnel_server; - const gchar *addr_tostr; + const gchar *addr_tostr = NULL; gchar *status = NULL; gchar *ssh_tunnel_host, *srv_host; gint netmonit, srv_port, ssh_tunnel_port; diff --git a/src/remmina_protocol_widget.c b/src/remmina_protocol_widget.c index 9a7099c9c..070b05c0e 100644 --- a/src/remmina_protocol_widget.c +++ b/src/remmina_protocol_widget.c @@ -1007,7 +1007,6 @@ static void cancel_start_direct_tunnel_cb(void *cbdata, int btn) { printf("Remmina: Cancelling start_direct_tunnel is not implemented\n"); } -#endif static gboolean remmina_protocol_widget_tunnel_destroy(RemminaSSHTunnel *tunnel, gpointer data) { @@ -1040,6 +1039,7 @@ static gboolean remmina_protocol_widget_tunnel_destroy(RemminaSSHTunnel *tunnel, } return TRUE; } +#endif /** * Start an SSH tunnel if possible and return the host:port string. diff --git a/src/remmina_ssh.c b/src/remmina_ssh.c index 6a60d3eed..c5419df7c 100644 --- a/src/remmina_ssh.c +++ b/src/remmina_ssh.c @@ -169,7 +169,7 @@ remmina_ssh_auth_interactive(RemminaSSH *ssh) gint ret; gint n; gint i; - const gchar *name, *instruction; + const gchar *name, *instruction = NULL; //gchar *prompt,*ptr; ret = SSH_AUTH_ERROR; @@ -578,7 +578,7 @@ remmina_ssh_auth(RemminaSSH *ssh, const gchar *password, RemminaProtocolWidget * { TRACE_CALL(__func__); gint method; - enum remmina_ssh_auth_result rv; + enum remmina_ssh_auth_result rv = REMMINA_SSH_AUTH_NULL; /* Check known host again to ensure it’s still the original server when user forks * a new session from existing one */ @@ -870,11 +870,11 @@ remmina_ssh_auth_gui(RemminaSSH *ssh, RemminaProtocolWidget *gp, RemminaFile *re { TRACE_CALL(__func__); gchar *keyname; - gchar *pwdfkey; + gchar *pwdfkey = NULL; gchar *message; gchar *current_pwd; gchar *current_user; - const gchar *instruction; + const gchar *instruction = NULL; gint ret; size_t len; guchar *pubkey; @@ -2370,7 +2370,7 @@ remmina_ssh_shell_thread(gpointer data) gchar *filename; const gchar *dir; const gchar *sshlogname; - FILE *fp; + FILE *fp = NULL; //gint screen; @@ -2489,7 +2489,7 @@ remmina_ssh_shell_thread(gpointer data) } while (len > 0) { ret = write(shell->slave, buf, len); - if (remmina_file_get_int (remminafile, "sshsavesession", FALSE)) { + if (fp != NULL) { fwrite(buf, ret, 1, fp ); fflush(fp); } diff --git a/src/remmina_ssh.h b/src/remmina_ssh.h index 9d1445ee7..4a7082096 100644 --- a/src/remmina_ssh.h +++ b/src/remmina_ssh.h @@ -105,6 +105,7 @@ gboolean remmina_ssh_init_session(RemminaSSH *ssh); enum remmina_ssh_auth_result { + REMMINA_SSH_AUTH_NULL, REMMINA_SSH_AUTH_SUCCESS, REMMINA_SSH_AUTH_PARTIAL, REMMINA_SSH_AUTH_AGAIN, diff --git a/src/remmina_ssh_plugin.c b/src/remmina_ssh_plugin.c index a89805031..dfc67044f 100644 --- a/src/remmina_ssh_plugin.c +++ b/src/remmina_ssh_plugin.c @@ -273,7 +273,7 @@ remmina_plugin_ssh_main_thread(gpointer data) gboolean cont = FALSE; gboolean partial = FALSE; gchar *hostport; - gint ret; + gint ret = REMMINA_SSH_AUTH_NULL; pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); CANCEL_ASYNC |