diff options
author | Damien Miller <djm@mindrot.org> | 2000-07-21 10:19:44 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-07-21 10:19:44 +1000 |
commit | 994cf1426d176e2ee9ba310416544c325e04b155 (patch) | |
tree | 8e8978bcec4c8a2aa83533936f90e7c3070e9def /channels.c | |
parent | 9dec7762798a4f9268e6033945c6dde44925d853 (diff) |
- (djm) OpenBSD CVS updates:
- markus@cvs.openbsd.org 2000/07/16 02:27:22
[authfd.c authfd.h channels.c clientloop.c ssh-add.c ssh-agent.c ssh.c]
[sshconnect1.c sshconnect2.c]
make ssh-add accept dsa keys (the agent does not)
- djm@cvs.openbsd.org 2000/07/17 19:25:02
[sshd.c]
Another closing of stdin; ok deraadt
- markus@cvs.openbsd.org 2000/07/19 18:33:12
[dsa.c]
missing free, reorder
- markus@cvs.openbsd.org 2000/07/20 16:23:14
[ssh-keygen.1]
document input and output files
Diffstat (limited to 'channels.c')
-rw-r--r-- | channels.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/channels.c b/channels.c index 3710b2fd4..ea395293a 100644 --- a/channels.c +++ b/channels.c | |||
@@ -17,13 +17,12 @@ | |||
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include "includes.h" | 19 | #include "includes.h" |
20 | RCSID("$OpenBSD: channels.c,v 1.63 2000/06/25 20:17:57 provos Exp $"); | 20 | RCSID("$OpenBSD: channels.c,v 1.64 2000/07/16 08:27:21 markus Exp $"); |
21 | 21 | ||
22 | #include "ssh.h" | 22 | #include "ssh.h" |
23 | #include "packet.h" | 23 | #include "packet.h" |
24 | #include "xmalloc.h" | 24 | #include "xmalloc.h" |
25 | #include "buffer.h" | 25 | #include "buffer.h" |
26 | #include "authfd.h" | ||
27 | #include "uidswap.h" | 26 | #include "uidswap.h" |
28 | #include "readconf.h" | 27 | #include "readconf.h" |
29 | #include "servconf.h" | 28 | #include "servconf.h" |
@@ -34,6 +33,11 @@ RCSID("$OpenBSD: channels.c,v 1.63 2000/06/25 20:17:57 provos Exp $"); | |||
34 | 33 | ||
35 | #include "ssh2.h" | 34 | #include "ssh2.h" |
36 | 35 | ||
36 | #include <openssl/rsa.h> | ||
37 | #include <openssl/dsa.h> | ||
38 | #include "key.h" | ||
39 | #include "authfd.h" | ||
40 | |||
37 | /* Maximum number of fake X11 displays to try. */ | 41 | /* Maximum number of fake X11 displays to try. */ |
38 | #define MAX_DISPLAYS 1000 | 42 | #define MAX_DISPLAYS 1000 |
39 | 43 | ||