Import of OpenSSH 4.2p1

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

diff --git a/openssh/misc.h b/openssh/misc.h
index 8bbc87f0dbda4086d21c403b3f4002c64c6ed48f..2d630feb5f87f0fc805cec34f29da41f210c039c 100644 (file)
--- a/openssh/misc.h
+++ b/openssh/misc.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: misc.h,v 1.21 2005/03/01 10:09:52 djm Exp $   */
+/*     $OpenBSD: misc.h,v 1.25 2005/07/14 04:00:43 dtucker Exp $       */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -24,6 +24,9 @@ char  *hpdelim(char **);
 char   *cleanhostname(char *);
 char   *colon(char *);
 long    convtime(const char *);
+char   *tilde_expand_filename(const char *, uid_t);
+char   *percent_expand(const char *, ...) __attribute__((__sentinel__));
+char   *tohex(const u_char *, u_int);
 
 struct passwd *pwcopy(struct passwd *);
 
@@ -35,10 +38,6 @@ struct arglist {
 };
 void    addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
 
-/* tildexpand.c */
-
-char   *tilde_expand_filename(const char *, uid_t);
-
 /* readpass.c */
 
 #define RP_ECHO                        0x0001