Start logging earlier in PSCP and PSFTP.

We were missing log messages about the start of the network connection.
This commit is contained in:
Jacob Nevins 2017-02-11 00:23:36 +00:00
Родитель 18f98bae21
Коммит 415224eab5
2 изменённых файлов: 6 добавлений и 4 удалений

5
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);

Просмотреть файл

@ -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;