[openssh-commits] [openssh] 02/08: upstream commit
git+noreply at mindrot.org
git+noreply at mindrot.org
Mon Sep 4 09:39:03 AEST 2017
This is an automated email from the git hooks/post-receive script.
djm pushed a commit to branch master
in repository openssh.
commit 530591a5795a02d01c78877d58604723918aac87
Author: dlg at openbsd.org <dlg at openbsd.org>
Date: Tue Aug 29 09:42:29 2017 +0000
upstream commit
add a -q option to ssh-add to make it quiet on success.
if you want to silence ssh-add without this you generally redirect
the output to /dev/null, but that can hide error output which you
should see.
ok djm@
Upstream-ID: 2f31b9b13f99dcf587e9a8ba443458e6c0d8997c
---
ssh-add.1 | 8 +++++---
ssh-add.c | 36 +++++++++++++++++++++++-------------
2 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/ssh-add.1 b/ssh-add.1
index 509d8fb4..471a23e7 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-add.1,v 1.64 2017/05/05 10:41:58 naddy Exp $
+.\" $OpenBSD: ssh-add.1,v 1.65 2017/08/29 09:42:29 dlg Exp $
.\"
.\" Author: Tatu Ylonen <ylo at cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: May 5 2017 $
+.Dd $Mdocdate: August 29 2017 $
.Dt SSH-ADD 1
.Os
.Sh NAME
@@ -43,7 +43,7 @@
.Nd adds private key identities to the authentication agent
.Sh SYNOPSIS
.Nm ssh-add
-.Op Fl cDdkLlXx
+.Op Fl cDdkLlqXx
.Op Fl E Ar fingerprint_hash
.Op Fl t Ar life
.Op Ar
@@ -134,6 +134,8 @@ Set a maximum lifetime when adding identities to an agent.
The lifetime may be specified in seconds or in a time format
specified in
.Xr sshd_config 5 .
+.It Fl q
+Be quiet after a successful operation.
.It Fl X
Unlock the agent.
.It Fl x
diff --git a/ssh-add.c b/ssh-add.c
index 72d89db4..2afd4833 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.133 2017/07/01 13:50:45 djm Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.134 2017/08/29 09:42:29 dlg Exp $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -102,7 +102,7 @@ clear_pass(void)
}
static int
-delete_file(int agent_fd, const char *filename, int key_only)
+delete_file(int agent_fd, const char *filename, int key_only, int qflag)
{
struct sshkey *public, *cert = NULL;
char *certpath = NULL, *comment = NULL;
@@ -113,7 +113,10 @@ delete_file(int agent_fd, const char *filename, int key_only)
return -1;
}
if ((r = ssh_remove_identity(agent_fd, public)) == 0) {
- fprintf(stderr, "Identity removed: %s (%s)\n", filename, comment);
+ if (!qflag) {
+ fprintf(stderr, "Identity removed: %s (%s)\n",
+ filename, comment);
+ }
ret = 0;
} else
fprintf(stderr, "Could not remove identity \"%s\": %s\n",
@@ -138,8 +141,10 @@ delete_file(int agent_fd, const char *filename, int key_only)
certpath, filename);
if ((r = ssh_remove_identity(agent_fd, cert)) == 0) {
- fprintf(stderr, "Identity removed: %s (%s)\n", certpath,
- comment);
+ if (!qflag) {
+ fprintf(stderr, "Identity removed: %s (%s)\n",
+ certpath, comment);
+ }
ret = 0;
} else
fprintf(stderr, "Could not remove identity \"%s\": %s\n",
@@ -179,7 +184,7 @@ delete_all(int agent_fd)
}
static int
-add_file(int agent_fd, const char *filename, int key_only)
+add_file(int agent_fd, const char *filename, int key_only, int qflag)
{
struct sshkey *private, *cert;
char *comment = NULL;
@@ -427,13 +432,13 @@ lock_agent(int agent_fd, int lock)
}
static int
-do_file(int agent_fd, int deleting, int key_only, char *file)
+do_file(int agent_fd, int deleting, int key_only, char *file, int qflag)
{
if (deleting) {
- if (delete_file(agent_fd, file, key_only) == -1)
+ if (delete_file(agent_fd, file, key_only, qflag) == -1)
return -1;
} else {
- if (add_file(agent_fd, file, key_only) == -1)
+ if (add_file(agent_fd, file, key_only, qflag) == -1)
return -1;
}
return 0;
@@ -456,6 +461,7 @@ usage(void)
fprintf(stderr, " -X Unlock agent.\n");
fprintf(stderr, " -s pkcs11 Add keys from PKCS#11 provider.\n");
fprintf(stderr, " -e pkcs11 Remove keys provided by PKCS#11 provider.\n");
+ fprintf(stderr, " -q Be quiet after a successful operation.\n");
}
int
@@ -466,7 +472,7 @@ main(int argc, char **argv)
int agent_fd;
char *pkcs11provider = NULL;
int r, i, ch, deleting = 0, ret = 0, key_only = 0;
- int xflag = 0, lflag = 0, Dflag = 0;
+ int xflag = 0, lflag = 0, Dflag = 0, qflag = 0;
ssh_malloc_init(); /* must be called before any mallocs */
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
@@ -494,7 +500,7 @@ main(int argc, char **argv)
exit(2);
}
- while ((ch = getopt(argc, argv, "klLcdDxXE:e:s:t:")) != -1) {
+ while ((ch = getopt(argc, argv, "klLcdDxXE:e:qs:t:")) != -1) {
switch (ch) {
case 'E':
fingerprint_hash = ssh_digest_alg_by_name(optarg);
@@ -539,6 +545,9 @@ main(int argc, char **argv)
goto done;
}
break;
+ case 'q':
+ qflag = 1;
+ break;
default:
usage();
ret = 1;
@@ -587,7 +596,8 @@ main(int argc, char **argv)
default_files[i]);
if (stat(buf, &st) < 0)
continue;
- if (do_file(agent_fd, deleting, key_only, buf) == -1)
+ if (do_file(agent_fd, deleting, key_only, buf,
+ qflag) == -1)
ret = 1;
else
count++;
@@ -597,7 +607,7 @@ main(int argc, char **argv)
} else {
for (i = 0; i < argc; i++) {
if (do_file(agent_fd, deleting, key_only,
- argv[i]) == -1)
+ argv[i], qflag) == -1)
ret = 1;
}
}
--
To stop receiving notification emails like this one, please contact
djm at mindrot.org.
More information about the openssh-commits
mailing list