summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-08-19 00:33:05 +1000
committerDamien Miller <djm@mindrot.org>2006-08-19 00:33:05 +1000
commitbdf00ca0bda672d07516d65eaea999931dafdac3 (patch)
tree0f77a7764b48599343bd535bb480b750c2ddc51f
parent3f8123c804bdabbc95caf9e3495310e584944fb2 (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--ChangeLog6
-rw-r--r--misc.h26
2 files changed, 18 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 8fdabe467..63b3da3b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,10 @@
30 [auth.h session.c sshd.c] 30 [auth.h session.c sshd.c]
31 delay authentication related cleanups until we're authenticated and 31 delay authentication related cleanups until we're authenticated and
32 all alarms have been cancelled; ok deraadt 32 all alarms have been cancelled; ok deraadt
33 - djm@cvs.openbsd.org 2006/08/18 10:27:16
34 [misc.h]
35 reorder so prototypes are sorted by the files they refer to; no
36 binary change
33 37
3420060817 3820060817
35 - (dtucker) [openbsd-compat/fake-rfc2553.c openbsd-compat/setproctitle.c] 39 - (dtucker) [openbsd-compat/fake-rfc2553.c openbsd-compat/setproctitle.c]
@@ -5251,4 +5255,4 @@
5251 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5255 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5252 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5256 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5253 5257
5254$Id: ChangeLog,v 1.4492 2006/08/18 14:32:46 djm Exp $ 5258$Id: ChangeLog,v 1.4493 2006/08/18 14:33:05 djm Exp $
diff --git a/misc.h b/misc.h
index 072470bad..f175b4426 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.h,v 1.35 2006/08/03 03:34:42 deraadt Exp $ */ 1/* $OpenBSD: misc.h,v 1.36 2006/08/18 10:27:16 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -48,17 +48,6 @@ void replacearg(arglist *, u_int, char *, ...)
48 __attribute__((format(printf, 3, 4))); 48 __attribute__((format(printf, 3, 4)));
49void freeargs(arglist *); 49void freeargs(arglist *);
50 50
51/* readpass.c */
52
53#define RP_ECHO 0x0001
54#define RP_ALLOW_STDIN 0x0002
55#define RP_ALLOW_EOF 0x0004
56#define RP_USE_ASKPASS 0x0008
57
58char *read_passphrase(const char *, int);
59int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));
60int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *);
61
62int tun_open(int, int); 51int tun_open(int, int);
63 52
64/* Common definitions for ssh tunnel device forwarding */ 53/* Common definitions for ssh tunnel device forwarding */
@@ -86,5 +75,16 @@ void put_u32(void *, u_int32_t)
86void put_u16(void *, u_int16_t) 75void put_u16(void *, u_int16_t)
87 __attribute__((__bounded__( __minbytes__, 1, 2))); 76 __attribute__((__bounded__( __minbytes__, 1, 2)));
88 77
89#endif /* _MISC_H */
90 78
79/* readpass.c */
80
81#define RP_ECHO 0x0001
82#define RP_ALLOW_STDIN 0x0002
83#define RP_ALLOW_EOF 0x0004
84#define RP_USE_ASKPASS 0x0008
85
86char *read_passphrase(const char *, int);
87int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));
88int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *);
89
90#endif /* _MISC_H */