diff options
Diffstat (limited to 'backport-upstream-Donot-attempt-to-fprintf-a-null-identity-co.patch')
| -rw-r--r-- | backport-upstream-Donot-attempt-to-fprintf-a-null-identity-co.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/backport-upstream-Donot-attempt-to-fprintf-a-null-identity-co.patch b/backport-upstream-Donot-attempt-to-fprintf-a-null-identity-co.patch new file mode 100644 index 0000000..66f2f90 --- /dev/null +++ b/backport-upstream-Donot-attempt-to-fprintf-a-null-identity-co.patch @@ -0,0 +1,37 @@ +From f29d6cf98c25bf044079032d22c1a57c63ab9d8e Mon Sep 17 00:00:00 2001 +From: "dtucker@openbsd.org" <dtucker@openbsd.org> +Date: Sat, 18 Jun 2022 02:17:16 +0000 +Subject: upstream: Don't attempt to fprintf a null identity comment. From + +Martin Vahlensieck via tech@. + +OpenBSD-Commit-ID: 4c54d20a8e8e4e9912c38a7b4ef5bfc5ca2e05c2 + +Conflict:NA +Reference:https://anongit.mindrot.org/openssh.git/patch/?id=f29d6cf98c25bf044079032d22c1a57c63ab9d8e +--- + ssh-add.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ssh-add.c b/ssh-add.c +index 29c0b17..d60bafc 100644 +--- a/ssh-add.c ++++ b/ssh-add.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: ssh-add.c,v 1.160 2021/04/03 06:18:41 djm Exp $ */ ++/* $OpenBSD: ssh-add.c,v 1.166 2022/06/18 02:17:16 dtucker Exp $ */ + /* + * Author: Tatu Ylonen <ylo@cs.hut.fi> + * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland +@@ -125,7 +125,7 @@ delete_one(int agent_fd, const struct sshkey *key, const char *comment, + } + if (!qflag) { + fprintf(stderr, "Identity removed: %s %s (%s)\n", path, +- sshkey_type(key), comment); ++ sshkey_type(key), comment ? comment : "no comment"); + } + return 0; + } +-- +2.33.0 + |