diff options
| author | des <des@FreeBSD.org> | 2017-09-02 21:58:42 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2017-09-02 21:58:42 +0000 |
| commit | ca26403304720e30901aa6f7bde4883af9662d2d (patch) | |
| tree | 24e8f197b92c6ecd99617ac7584b6ba544a46aec /crypto/openssh/misc.h | |
| parent | ce0d6faba2a9fd27ff0fc0942a4e51f5203bb88f (diff) | |
| download | FreeBSD-src-ca26403304720e30901aa6f7bde4883af9662d2d.zip FreeBSD-src-ca26403304720e30901aa6f7bde4883af9662d2d.tar.gz | |
MFH (r314306,r314720): Upgrade OpenSSH to 7.4p1.
Diffstat (limited to 'crypto/openssh/misc.h')
| -rw-r--r-- | crypto/openssh/misc.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/crypto/openssh/misc.h b/crypto/openssh/misc.h index 7c76a6a..c242f90 100644 --- a/crypto/openssh/misc.h +++ b/crypto/openssh/misc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.57 2016/07/15 00:24:30 djm Exp $ */ +/* $OpenBSD: misc.h,v 1.61 2016/11/30 00:28:31 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -15,6 +15,8 @@ #ifndef _MISC_H #define _MISC_H +#include <sys/time.h> + /* Data structure for representing a forwarding request. */ struct Forward { char *listen_host; /* Host (address) to listen on. */ @@ -28,6 +30,8 @@ struct Forward { }; int forward_equals(const struct Forward *, const struct Forward *); +int bind_permitted(int, uid_t); +int daemonized(void); /* Common server and client forwarding options. */ struct ForwardOptions { @@ -139,4 +143,8 @@ char *read_passphrase(const char *, int); int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2))); int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *); +#define MINIMUM(a, b) (((a) < (b)) ? (a) : (b)) +#define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b)) +#define ROUNDUP(x, y) ((((x)+((y)-1))/(y))*(y)) + #endif /* _MISC_H */ |
