diff options
Diffstat (limited to 'misc.h')
-rw-r--r-- | misc.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.h,v 1.71 2018/03/12 00:52:01 djm Exp $ */ | 1 | /* $OpenBSD: misc.h,v 1.74 2018/07/27 05:13:02 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -31,7 +31,6 @@ struct Forward { | |||
31 | }; | 31 | }; |
32 | 32 | ||
33 | int forward_equals(const struct Forward *, const struct Forward *); | 33 | int forward_equals(const struct Forward *, const struct Forward *); |
34 | int bind_permitted(int, uid_t); | ||
35 | int daemonized(void); | 34 | int daemonized(void); |
36 | 35 | ||
37 | /* Common server and client forwarding options. */ | 36 | /* Common server and client forwarding options. */ |
@@ -45,6 +44,7 @@ struct ForwardOptions { | |||
45 | 44 | ||
46 | char *chop(char *); | 45 | char *chop(char *); |
47 | char *strdelim(char **); | 46 | char *strdelim(char **); |
47 | char *strdelimw(char **); | ||
48 | int set_nonblock(int); | 48 | int set_nonblock(int); |
49 | int unset_nonblock(int); | 49 | int unset_nonblock(int); |
50 | void set_nodelay(int); | 50 | void set_nodelay(int); |
@@ -166,7 +166,6 @@ int safe_path_fd(int, const char *, struct passwd *, | |||
166 | 166 | ||
167 | char *read_passphrase(const char *, int); | 167 | char *read_passphrase(const char *, int); |
168 | int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2))); | 168 | int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2))); |
169 | int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *); | ||
170 | 169 | ||
171 | #define MINIMUM(a, b) (((a) < (b)) ? (a) : (b)) | 170 | #define MINIMUM(a, b) (((a) < (b)) ? (a) : (b)) |
172 | #define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b)) | 171 | #define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b)) |