diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-02-10 09:25:34 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-02-10 20:26:40 +1100 |
commit | d9e5cf078ea5380da6df767bb1773802ec557ef0 (patch) | |
tree | 22ddb85f348a21fbd762b084bd4aab65c2ff221a /sshconnect.c | |
parent | a7c38215d564bf98e8e9eb40c1079e3adf686f15 (diff) |
upstream commit
constify some private key-related functions; based on
https://github.com/openssh/openssh-portable/pull/56 by Vincent Brillault
OpenBSD-Commit-ID: dcb94a41834a15f4d00275cb5051616fdc4c988c
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sshconnect.c b/sshconnect.c index e37bb0856..6eff397d6 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.293 2018/02/07 22:52:45 dtucker Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.294 2018/02/10 09:25:35 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1458,8 +1458,8 @@ ssh_local_cmd(const char *args) | |||
1458 | } | 1458 | } |
1459 | 1459 | ||
1460 | void | 1460 | void |
1461 | maybe_add_key_to_agent(char *authfile, struct sshkey *private, char *comment, | 1461 | maybe_add_key_to_agent(char *authfile, const struct sshkey *private, |
1462 | char *passphrase) | 1462 | char *comment, char *passphrase) |
1463 | { | 1463 | { |
1464 | int auth_sock = -1, r; | 1464 | int auth_sock = -1, r; |
1465 | 1465 | ||