diff options
| author | millert@openbsd.org <millert@openbsd.org> | 2017-10-22 01:06:24 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-10-23 07:10:08 +0200 |
| commit | 887669ef032d63cf07f53cada216fa8a0c9a7d72 (patch) | |
| tree | 089b20255da21a489d7bc796a8ee86bd0b8f028f /misc.h | |
| parent | Fix missed RCSID merges (diff) | |
| download | openssh-887669ef032d63cf07f53cada216fa8a0c9a7d72.tar.xz openssh-887669ef032d63cf07f53cada216fa8a0c9a7d72.zip | |
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 'misc.h')
| -rw-r--r-- | misc.h | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.63 2017/08/18 05:48:04 djm Exp $ */ +/* $OpenBSD: misc.h,v 1.64 2017/10/21 23:06:24 millert Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -54,7 +54,9 @@ char *put_host_port(const char *, u_short); char *hpdelim(char **); char *cleanhostname(char *); char *colon(char *); +int parse_user_host_path(const char *, char **, char **, char **); int parse_user_host_port(const char *, char **, char **, int *); +int parse_uri(const char *, const char *, char **, char **, int *, char **); long convtime(const char *); char *tilde_expand_filename(const char *, uid_t); char *percent_expand(const char *, ...) __attribute__((__sentinel__)); @@ -66,6 +68,7 @@ time_t monotime(void); double monotime_double(void); void lowercase(char *s); int unix_listener(const char *, int, int); +int valid_domain(char *, int, const char **); void sock_set_v6only(int); |