diff options
| author | des <des@FreeBSD.org> | 2017-09-02 14:25:20 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2017-09-02 14:25:20 +0000 |
| commit | ce0d6faba2a9fd27ff0fc0942a4e51f5203bb88f (patch) | |
| tree | e29bf4f30ea560420ac21b41c62cc53b42547a0b /crypto/openssh/misc.h | |
| parent | fa127d1375fbc969c65e8d8a5f9f2f8efe4e36fc (diff) | |
| download | FreeBSD-src-ce0d6faba2a9fd27ff0fc0942a4e51f5203bb88f.zip FreeBSD-src-ce0d6faba2a9fd27ff0fc0942a4e51f5203bb88f.tar.gz | |
MFH (r314527,r314576,r314601,r317998): Upgrade OpenSSH to 7.3p1.
Diffstat (limited to 'crypto/openssh/misc.h')
| -rw-r--r-- | crypto/openssh/misc.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/openssh/misc.h b/crypto/openssh/misc.h index 374c33c..7c76a6a 100644 --- a/crypto/openssh/misc.h +++ b/crypto/openssh/misc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.54 2014/07/15 15:54:14 millert Exp $ */ +/* $OpenBSD: misc.h,v 1.57 2016/07/15 00:24:30 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -27,6 +27,8 @@ struct Forward { int handle; /* Handle for dynamic listen ports */ }; +int forward_equals(const struct Forward *, const struct Forward *); + /* Common server and client forwarding options. */ struct ForwardOptions { int gateway_ports; /* Allow remote connects to forwarded ports. */ @@ -47,6 +49,7 @@ char *put_host_port(const char *, u_short); char *hpdelim(char **); char *cleanhostname(char *); char *colon(char *); +int parse_user_host_port(const char *, char **, char **, int *); long convtime(const char *); char *tilde_expand_filename(const char *, uid_t); char *percent_expand(const char *, ...) __attribute__((__sentinel__)); @@ -55,6 +58,7 @@ void sanitise_stdfd(void); void ms_subtract_diff(struct timeval *, int *); void ms_to_timeval(struct timeval *, int); time_t monotime(void); +double monotime_double(void); void lowercase(char *s); int unix_listener(const char *, int, int); |
