diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-09-16 15:11:19 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-09-19 17:21:59 +1000 |
| commit | e694f8ac4409931e67d08ac44ed251b20b10a957 (patch) | |
| tree | 8c5e8ccc8261faaca82acd046bd5e8304c9ebebb /scp.c | |
| parent | 8a7a06ee505cb833e613f74a07392e9296286c30 (diff) | |
| download | openssh-git-e694f8ac4409931e67d08ac44ed251b20b10a957.tar.gz | |
upstream: allow log_stderr==2 to prefix log messages with argv[0]
use this to make scp's SFTP mode error messages more scp-like
prompted by and ok deraadt@
OpenBSD-Commit-ID: 0e821dbde423fc2280e47414bdc22aaa5b4e0733
Diffstat (limited to 'scp.c')
| -rw-r--r-- | scp.c | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.234 2021/09/11 00:40:24 djm Exp $ */ +/* $OpenBSD: scp.c,v 1.235 2021/09/16 15:11:19 djm Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -467,7 +467,7 @@ main(int argc, char **argv) __progname = ssh_get_progname(argv[0]); - log_init(argv0, log_level, SYSLOG_FACILITY_USER, 1); + log_init(argv0, log_level, SYSLOG_FACILITY_USER, 2); memset(&args, '\0', sizeof(args)); memset(&remote_remote_args, '\0', sizeof(remote_remote_args)); @@ -588,7 +588,7 @@ main(int argc, char **argv) argc -= optind; argv += optind; - log_init(argv0, log_level, SYSLOG_FACILITY_USER, 1); + log_init(argv0, log_level, SYSLOG_FACILITY_USER, 2); /* Do this last because we want the user to be able to override it */ addargs(&args, "-oForwardAgent=no"); @@ -1540,10 +1540,8 @@ out: free(abs_src); free(tmp); globfree(&g); - if (err == -1) { - error("Failed to download '%s'", src); + if (err == -1) errs = 1; - } } @@ -1942,7 +1940,7 @@ out: free(tmp); globfree(&g); if (err == -1) - fatal("Failed to download file '%s'", src); + errs = 1; } int |