forked from pool/openssh
318211936a
Version update to 8.1p1:
* ssh-keygen(1): when acting as a CA and signing certificates with
an RSA key, default to using the rsa-sha2-512 signature algorithm.
Certificates signed by RSA keys will therefore be incompatible
with OpenSSH versions prior to 7.2 unless the default is
overridden (using "ssh-keygen -t ssh-rsa -s ...").
* ssh(1): Allow %n to be expanded in ProxyCommand strings
* ssh(1), sshd(8): Allow prepending a list of algorithms to the
default set by starting the list with the '^' character, E.g.
"HostKeyAlgorithms ^ssh-ed25519"
* ssh-keygen(1): add an experimental lightweight signature and
verification ability. Signatures may be made using regular ssh keys
held on disk or stored in a ssh-agent and verified against an
authorized_keys-like list of allowed keys. Signatures embed a
namespace that prevents confusion and attacks between different
usage domains (e.g. files vs email).
* ssh-keygen(1): print key comment when extracting public key from a
private key.
* ssh-keygen(1): accept the verbose flag when searching for host keys
in known hosts (i.e. "ssh-keygen -vF host") to print the matching
host's random-art signature too.
* All: support PKCS8 as an optional format for storage of private
keys to disk. The OpenSSH native key format remains the default,
but PKCS8 is a superior format to PEM if interoperability with
non-OpenSSH software is required, as it may use a less insecure
key derivation function than PEM's.
- Additional changes from 8.0p1 release:
* scp(1): Add "-T" flag to disable client-side filtering of
server file list.
* sshd(8): Remove support for obsolete "host/port" syntax.
OBS-URL: https://build.opensuse.org/request/show/737034
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=197
62 lines
1.6 KiB
Diff
62 lines
1.6 KiB
Diff
# HG changeset patch
|
|
# Parent 60bdbe6dd8d6bc011883472363d56e1d97f68835
|
|
Put back sftp client diagnostic messages in batch mode
|
|
|
|
bsc#1023275
|
|
diff --git a/sftp.1 b/sftp.1
|
|
index a52c1cf..7333de8 100644
|
|
--- a/sftp.1
|
|
+++ b/sftp.1
|
|
@@ -278,6 +278,9 @@ Specifies the port to connect to on the remote host.
|
|
.It Fl p
|
|
Preserves modification times, access times, and modes from the
|
|
original files transferred.
|
|
+.It Fl Q
|
|
+Not-so-quiet batch mode: forces printing of diagnostic messages
|
|
+in batch mode.
|
|
.It Fl q
|
|
Quiet mode: disables the progress meter as well as warning and
|
|
diagnostic messages from
|
|
diff --git a/sftp.c b/sftp.c
|
|
index b66037f..6c94a38 100644
|
|
--- a/sftp.c
|
|
+++ b/sftp.c
|
|
@@ -85,6 +85,9 @@ static volatile pid_t sshpid = -1;
|
|
/* Suppress diagnositic messages */
|
|
int quiet = 0;
|
|
|
|
+/* Force diagnositic messages in batch mode */
|
|
+int loud = 0;
|
|
+
|
|
/* This is set to 0 if the progressmeter is not desired. */
|
|
int showprogress = 1;
|
|
|
|
@@ -2406,7 +2409,7 @@ main(int argc, char **argv)
|
|
infile = stdin;
|
|
|
|
while ((ch = getopt(argc, argv,
|
|
- "1246afhpqrvCc:D:i:l:o:s:S:b:B:F:J:P:R:")) != -1) {
|
|
+ "1246afhpQqrvCc:D:i:l:o:s:S:b:B:F:J:P:R:")) != -1) {
|
|
switch (ch) {
|
|
/* Passed through to ssh(1) */
|
|
case '4':
|
|
@@ -2423,6 +2426,9 @@ main(int argc, char **argv)
|
|
addargs(&args, "-%c", ch);
|
|
addargs(&args, "%s", optarg);
|
|
break;
|
|
+ case 'Q':
|
|
+ loud = 1;
|
|
+ break;
|
|
case 'q':
|
|
ll = SYSLOG_LEVEL_ERROR;
|
|
quiet = 1;
|
|
@@ -2506,6 +2512,8 @@ main(int argc, char **argv)
|
|
usage();
|
|
}
|
|
}
|
|
+ if (batchmode && loud)
|
|
+ quiet = 0;
|
|
|
|
if (!isatty(STDERR_FILENO))
|
|
showprogress = 0;
|