diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-01-25 08:17:18 +0100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-01-25 08:20:01 +0100 |
commit | 022ce92fa0daa9d78830baeb2bd2dc3f83c724ba (patch) | |
tree | f2636fb014494e4687ece2418ea7ea5072cf7ac2 /sshconnect.h | |
parent | upstream: group14-sha1 is no longer a default algorithm (diff) | |
download | openssh-022ce92fa0daa9d78830baeb2bd2dc3f83c724ba.tar.xz openssh-022ce92fa0daa9d78830baeb2bd2dc3f83c724ba.zip |
upstream: when AddKeysToAgent=yes is set and the key contains no
comment, add the key to the agent with the key's path as the comment. bz2564
OpenBSD-Commit-ID: 8dd8ca9340d7017631a27f4ed5358a4cfddec16f
Diffstat (limited to 'sshconnect.h')
-rw-r--r-- | sshconnect.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sshconnect.h b/sshconnect.h index 2e84b8bc5..7c091e2b1 100644 --- a/sshconnect.h +++ b/sshconnect.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.h,v 1.39 2019/09/13 04:27:35 djm Exp $ */ +/* $OpenBSD: sshconnect.h,v 1.40 2020/01/25 07:17:18 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -53,4 +53,5 @@ void ssh_userauth2(struct ssh *ssh, const char *, const char *, int ssh_local_cmd(const char *); -void maybe_add_key_to_agent(char *, struct sshkey *, char *, char *); +void maybe_add_key_to_agent(const char *, struct sshkey *, + const char *, const char *); |