diff options
| author | Damien Miller <djm@mindrot.org> | 2006-08-19 00:33:05 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2006-08-19 00:33:05 +1000 |
| commit | bdf00ca0bda672d07516d65eaea999931dafdac3 (patch) | |
| tree | 0f77a7764b48599343bd535bb480b750c2ddc51f | |
| parent | 3f8123c804bdabbc95caf9e3495310e584944fb2 (diff) | |
- djm@cvs.openbsd.org 2006/08/18 10:27:16
[misc.h]
reorder so prototypes are sorted by the files they refer to; no
binary change
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | misc.h | 26 |
2 files changed, 18 insertions, 14 deletions
@@ -30,6 +30,10 @@ [auth.h session.c sshd.c] delay authentication related cleanups until we're authenticated and all alarms have been cancelled; ok deraadt + - djm@cvs.openbsd.org 2006/08/18 10:27:16 + [misc.h] + reorder so prototypes are sorted by the files they refer to; no + binary change 20060817 - (dtucker) [openbsd-compat/fake-rfc2553.c openbsd-compat/setproctitle.c] @@ -5251,4 +5255,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4492 2006/08/18 14:32:46 djm Exp $ +$Id: ChangeLog,v 1.4493 2006/08/18 14:33:05 djm Exp $ @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.35 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: misc.h,v 1.36 2006/08/18 10:27:16 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -48,17 +48,6 @@ void replacearg(arglist *, u_int, char *, ...) __attribute__((format(printf, 3, 4))); void freeargs(arglist *); -/* readpass.c */ - -#define RP_ECHO 0x0001 -#define RP_ALLOW_STDIN 0x0002 -#define RP_ALLOW_EOF 0x0004 -#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 *); - int tun_open(int, int); /* Common definitions for ssh tunnel device forwarding */ @@ -86,5 +75,16 @@ void put_u32(void *, u_int32_t) void put_u16(void *, u_int16_t) __attribute__((__bounded__( __minbytes__, 1, 2))); -#endif /* _MISC_H */ +/* readpass.c */ + +#define RP_ECHO 0x0001 +#define RP_ALLOW_STDIN 0x0002 +#define RP_ALLOW_EOF 0x0004 +#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 *); + +#endif /* _MISC_H */ |