From 415224eab5791f504c08146db901fe87837a19f6 Mon Sep 17 00:00:00 2001 From: Jacob Nevins Date: Sat, 11 Feb 2017 00:23:36 +0000 Subject: [PATCH] Start logging earlier in PSCP and PSFTP. We were missing log messages about the start of the network connection. --- pscp.c | 5 +++-- psftp.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pscp.c b/pscp.c index 25a2a737..5d8256df 100644 --- a/pscp.c +++ b/pscp.c @@ -514,6 +514,9 @@ static void do_cmd(char *host, char *user, char *cmd) back = &ssh_backend; + logctx = log_init(NULL, conf); + console_provide_logctx(logctx); + err = back->init(NULL, &backhandle, conf, conf_get_str(conf, CONF_host), conf_get_int(conf, CONF_port), @@ -521,9 +524,7 @@ static void do_cmd(char *host, char *user, char *cmd) conf_get_int(conf, CONF_tcp_keepalives)); if (err != NULL) bump("ssh_init: %s", err); - logctx = log_init(NULL, conf); back->provide_logctx(backhandle, logctx); - console_provide_logctx(logctx); ssh_scp_init(); if (verbose && realhost != NULL && errs == 0) tell_user(stderr, "Connected to %s", realhost); diff --git a/psftp.c b/psftp.c index 513f202b..83dec968 100644 --- a/psftp.c +++ b/psftp.c @@ -2837,6 +2837,9 @@ static int psftp_connect(char *userhost, char *user, int portnumber) back = &ssh_backend; + logctx = log_init(NULL, conf); + console_provide_logctx(logctx); + err = back->init(NULL, &backhandle, conf, conf_get_str(conf, CONF_host), conf_get_int(conf, CONF_port), @@ -2846,9 +2849,7 @@ static int psftp_connect(char *userhost, char *user, int portnumber) fprintf(stderr, "ssh_init: %s\n", err); return 1; } - logctx = log_init(NULL, conf); back->provide_logctx(backhandle, logctx); - console_provide_logctx(logctx); while (!back->sendok(backhandle)) { if (back->exitcode(backhandle) >= 0) return 1; -- 2.45.1