aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssh/misc.h
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2017-03-06 01:37:05 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2017-03-06 01:37:05 +0000
commitca86bcf2531c7b149c95244a67853d44323e7855 (patch)
tree23390addad9593662304883efe4cae60bd1670a4 /crypto/openssh/misc.h
parent53de37f8ca93019f38b66657ba5f2bf53beff012 (diff)
parent19ca85510bbe080af3faf5e9ae394608428ac953 (diff)
downloadsrc-ca86bcf2531c7b149c95244a67853d44323e7855.tar.gz
src-ca86bcf2531c7b149c95244a67853d44323e7855.zip
Notes
Diffstat (limited to 'crypto/openssh/misc.h')
-rw-r--r--crypto/openssh/misc.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/crypto/openssh/misc.h b/crypto/openssh/misc.h
index 7c76a6a725e9..c242f9011f59 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 */