diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /misc.h | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'misc.h')
-rw-r--r-- | misc.h | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.h,v 1.17 2004/08/11 21:43:05 avsm Exp $ */ | 1 | /* $OpenBSD: misc.h,v 1.21 2005/03/01 10:09:52 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -20,6 +20,7 @@ int set_nonblock(int); | |||
20 | int unset_nonblock(int); | 20 | int unset_nonblock(int); |
21 | void set_nodelay(int); | 21 | void set_nodelay(int); |
22 | int a2port(const char *); | 22 | int a2port(const char *); |
23 | char *hpdelim(char **); | ||
23 | char *cleanhostname(char *); | 24 | char *cleanhostname(char *); |
24 | char *colon(char *); | 25 | char *colon(char *); |
25 | long convtime(const char *); | 26 | long convtime(const char *); |
@@ -46,3 +47,5 @@ char *tilde_expand_filename(const char *, uid_t); | |||
46 | #define RP_USE_ASKPASS 0x0008 | 47 | #define RP_USE_ASKPASS 0x0008 |
47 | 48 | ||
48 | char *read_passphrase(const char *, int); | 49 | char *read_passphrase(const char *, int); |
50 | int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2))); | ||
51 | int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *); | ||