Import of OpenSSH 4.0p1

[gssapi-openssh.git] / openssh / misc.h

diff --git a/openssh/misc.h b/openssh/misc.h
index ec47a611d485c65c6d440152fdd60cb8a6fda4f2..8bbc87f0dbda4086d21c403b3f4002c64c6ed48f 100644 (file)
--- a/openssh/misc.h
+++ b/openssh/misc.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: misc.h,v 1.17 2004/08/11 21:43:05 avsm Exp $  */
+/*     $OpenBSD: misc.h,v 1.21 2005/03/01 10:09:52 djm Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -20,6 +20,7 @@ int    set_nonblock(int);
 int     unset_nonblock(int);
 void    set_nodelay(int);
 int     a2port(const char *);
+char   *hpdelim(char **);
 char   *cleanhostname(char *);
 char   *colon(char *);
 long    convtime(const char *);
@@ -46,3 +47,5 @@ char  *tilde_expand_filename(const char *, uid_t);
 #define RP_USE_ASKPASS         0x0008
 
 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 *);