summaryrefslogtreecommitdiff
path: root/readconf.h
diff options
context:
space:
mode:
authormillert@openbsd.org <millert@openbsd.org>2017-10-21 23:06:24 +0000
committerDamien Miller <djm@mindrot.org>2017-10-23 16:10:08 +1100
commit887669ef032d63cf07f53cada216fa8a0c9a7d72 (patch)
tree089b20255da21a489d7bc796a8ee86bd0b8f028f /readconf.h
parentd27bff293cfeb2252f4c7a58babe5ad3262c6c98 (diff)
upstream commit
Add URI support to ssh, sftp and scp. For example ssh://user@host or sftp://user@host/path. The connection parameters described in draft-ietf-secsh-scp-sftp-ssh-uri-04 are not implemented since the ssh fingerprint format in the draft uses md5 with no way to specify the hash function type. OK djm@ Upstream-ID: 4ba3768b662d6722de59e6ecb00abf2d4bf9cacc
Diffstat (limited to 'readconf.h')
-rw-r--r--readconf.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h
index 22fe5c187..34aad83cf 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.h,v 1.123 2017/09/03 23:33:13 djm Exp $ */ 1/* $OpenBSD: readconf.h,v 1.124 2017/10/21 23:06:24 millert Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -204,6 +204,7 @@ int read_config_file(const char *, struct passwd *, const char *,
204 const char *, Options *, int); 204 const char *, Options *, int);
205int parse_forward(struct Forward *, const char *, int, int); 205int parse_forward(struct Forward *, const char *, int, int);
206int parse_jump(const char *, Options *, int); 206int parse_jump(const char *, Options *, int);
207int parse_ssh_uri(const char *, char **, char **, int *);
207int default_ssh_port(void); 208int default_ssh_port(void);
208int option_clear_or_none(const char *); 209int option_clear_or_none(const char *);
209void dump_client_config(Options *o, const char *host); 210void dump_client_config(Options *o, const char *host);