diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-06-09 00:17:10 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-06-09 00:17:10 +0000 |
commit | e6455aee8fe31931f006f390fcbf0e99c1fbaacf (patch) | |
tree | 53ba7fa048231130a23ae46f36d526d8791fd34f | |
parent | 2d0356f7de5e12dd818b705c54bc8a380827ab8e (diff) |
[NOTE: File split is was not done in Portabl Tree]
- markus@cvs.openbsd.org 2001/05/30 12:55:13
[auth-options.c auth2.c channels.c channels.h clientloop.c nchan.c
packet.c serverloop.c session.c ssh.c ssh1.h]
channel layer cleanup: merge header files and split .c files
-rw-r--r-- | ChangeLog | 17 | ||||
-rw-r--r-- | auth-options.c | 4 | ||||
-rw-r--r-- | auth2.c | 4 | ||||
-rw-r--r-- | clientloop.c | 4 | ||||
-rw-r--r-- | packet.c | 5 | ||||
-rw-r--r-- | serverloop.c | 4 | ||||
-rw-r--r-- | session.c | 5 | ||||
-rw-r--r-- | ssh.c | 4 | ||||
-rw-r--r-- | ssh1.h | 7 |
9 files changed, 31 insertions, 23 deletions
@@ -1,7 +1,14 @@ | |||
1 | 20010609 | ||
2 | - OpenBSD CVS Sync | ||
3 | - markus@cvs.openbsd.org 2001/05/30 12:55:13 | ||
4 | [auth-options.c auth2.c channels.c channels.h clientloop.c nchan.c | ||
5 | packet.c serverloop.c session.c ssh.c ssh1.h] | ||
6 | channel layer cleanup: merge header files and split .c files | ||
7 | |||
1 | 20010606 | 8 | 20010606 |
2 | - OpenBSD CVS Sync | 9 | - OpenBSD CVS Sync |
3 | - markus@cvs.openbsd.org 2001/05/17 21:34:15 | 10 | - markus@cvs.openbsd.org 2001/05/17 21:34:15 |
4 | [ssh.1] | 11 | [ssh.1] |
5 | no spaces in PreferredAuthentications; | 12 | no spaces in PreferredAuthentications; |
6 | meixner@rbg.informatik.tu-darmstadt.de | 13 | meixner@rbg.informatik.tu-darmstadt.de |
7 | - markus@cvs.openbsd.org 2001/05/18 14:13:29 | 14 | - markus@cvs.openbsd.org 2001/05/18 14:13:29 |
@@ -42,7 +49,7 @@ | |||
42 | - stevesk@cvs.openbsd.org 2001/05/19 19:57:09 | 49 | - stevesk@cvs.openbsd.org 2001/05/19 19:57:09 |
43 | [channels.c] | 50 | [channels.c] |
44 | typo in error message | 51 | typo in error message |
45 | - markus@cvs.openbsd.org 2001/05/20 17:20:36 | 52 | - markus@cvs.openbsd.org 2001/05/20 17:20:36 |
46 | [auth-rsa.c auth.c auth.h auth2.c servconf.c servconf.h sshd.8 | 53 | [auth-rsa.c auth.c auth.h auth2.c servconf.c servconf.h sshd.8 |
47 | sshd_config] | 54 | sshd_config] |
48 | configurable authorized_keys{,2} location; originally from peter@; | 55 | configurable authorized_keys{,2} location; originally from peter@; |
@@ -5508,4 +5515,4 @@ | |||
5508 | - Wrote replacements for strlcpy and mkdtemp | 5515 | - Wrote replacements for strlcpy and mkdtemp |
5509 | - Released 1.0pre1 | 5516 | - Released 1.0pre1 |
5510 | 5517 | ||
5511 | $Id: ChangeLog,v 1.1246 2001/06/05 21:13:57 mouring Exp $ | 5518 | $Id: ChangeLog,v 1.1247 2001/06/09 00:17:10 mouring Exp $ |
diff --git a/auth-options.c b/auth-options.c index 443f5414a..d6258ab1a 100644 --- a/auth-options.c +++ b/auth-options.c | |||
@@ -10,14 +10,14 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth-options.c,v 1.16 2001/03/18 12:07:52 markus Exp $"); | 13 | RCSID("$OpenBSD: auth-options.c,v 1.17 2001/05/30 12:55:06 markus Exp $"); |
14 | 14 | ||
15 | #include "packet.h" | 15 | #include "packet.h" |
16 | #include "xmalloc.h" | 16 | #include "xmalloc.h" |
17 | #include "match.h" | 17 | #include "match.h" |
18 | #include "log.h" | 18 | #include "log.h" |
19 | #include "canohost.h" | 19 | #include "canohost.h" |
20 | #include "channels.h" | 20 | #include "channel.h" |
21 | #include "auth-options.h" | 21 | #include "auth-options.h" |
22 | #include "servconf.h" | 22 | #include "servconf.h" |
23 | 23 | ||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2.c,v 1.58 2001/05/20 17:20:35 markus Exp $"); | 26 | RCSID("$OpenBSD: auth2.c,v 1.59 2001/05/30 12:55:06 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/evp.h> | 28 | #include <openssl/evp.h> |
29 | 29 | ||
@@ -36,7 +36,7 @@ RCSID("$OpenBSD: auth2.c,v 1.58 2001/05/20 17:20:35 markus Exp $"); | |||
36 | #include "log.h" | 36 | #include "log.h" |
37 | #include "servconf.h" | 37 | #include "servconf.h" |
38 | #include "compat.h" | 38 | #include "compat.h" |
39 | #include "channels.h" | 39 | #include "channel.h" |
40 | #include "bufaux.h" | 40 | #include "bufaux.h" |
41 | #include "auth.h" | 41 | #include "auth.h" |
42 | #include "session.h" | 42 | #include "session.h" |
diff --git a/clientloop.c b/clientloop.c index 74926836d..59a556a88 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -59,7 +59,7 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "includes.h" | 61 | #include "includes.h" |
62 | RCSID("$OpenBSD: clientloop.c,v 1.72 2001/05/24 18:57:53 stevesk Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.73 2001/05/30 12:55:10 markus Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -68,7 +68,7 @@ RCSID("$OpenBSD: clientloop.c,v 1.72 2001/05/24 18:57:53 stevesk Exp $"); | |||
68 | #include "packet.h" | 68 | #include "packet.h" |
69 | #include "buffer.h" | 69 | #include "buffer.h" |
70 | #include "compat.h" | 70 | #include "compat.h" |
71 | #include "channels.h" | 71 | #include "channel.h" |
72 | #include "dispatch.h" | 72 | #include "dispatch.h" |
73 | #include "buffer.h" | 73 | #include "buffer.h" |
74 | #include "bufaux.h" | 74 | #include "bufaux.h" |
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: packet.c,v 1.62 2001/05/28 23:58:35 markus Exp $"); | 40 | RCSID("$OpenBSD: packet.c,v 1.63 2001/05/30 12:55:11 markus Exp $"); |
41 | 41 | ||
42 | #include "xmalloc.h" | 42 | #include "xmalloc.h" |
43 | #include "buffer.h" | 43 | #include "buffer.h" |
@@ -48,7 +48,7 @@ RCSID("$OpenBSD: packet.c,v 1.62 2001/05/28 23:58:35 markus Exp $"); | |||
48 | 48 | ||
49 | #include "compress.h" | 49 | #include "compress.h" |
50 | #include "deattack.h" | 50 | #include "deattack.h" |
51 | #include "channels.h" | 51 | #include "channel.h" |
52 | 52 | ||
53 | #include "compat.h" | 53 | #include "compat.h" |
54 | #include "ssh1.h" | 54 | #include "ssh1.h" |
@@ -245,7 +245,6 @@ void | |||
245 | packet_set_protocol_flags(u_int protocol_flags) | 245 | packet_set_protocol_flags(u_int protocol_flags) |
246 | { | 246 | { |
247 | remote_protocol_flags = protocol_flags; | 247 | remote_protocol_flags = protocol_flags; |
248 | channel_set_options((protocol_flags & SSH_PROTOFLAG_HOST_IN_FWD_OPEN) != 0); | ||
249 | } | 248 | } |
250 | 249 | ||
251 | /* Returns the remote protocol flags set earlier by the above function. */ | 250 | /* Returns the remote protocol flags set earlier by the above function. */ |
diff --git a/serverloop.c b/serverloop.c index 6a5f40c4b..5f50b4ee7 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: serverloop.c,v 1.65 2001/05/08 19:17:31 markus Exp $"); | 38 | RCSID("$OpenBSD: serverloop.c,v 1.66 2001/05/30 12:55:12 markus Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "packet.h" | 41 | #include "packet.h" |
@@ -43,7 +43,7 @@ RCSID("$OpenBSD: serverloop.c,v 1.65 2001/05/08 19:17:31 markus Exp $"); | |||
43 | #include "log.h" | 43 | #include "log.h" |
44 | #include "servconf.h" | 44 | #include "servconf.h" |
45 | #include "sshpty.h" | 45 | #include "sshpty.h" |
46 | #include "channels.h" | 46 | #include "channel.h" |
47 | #include "compat.h" | 47 | #include "compat.h" |
48 | #include "ssh1.h" | 48 | #include "ssh1.h" |
49 | #include "ssh2.h" | 49 | #include "ssh2.h" |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.76 2001/05/19 00:36:40 djm Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.77 2001/05/30 12:55:13 markus Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -45,8 +45,7 @@ RCSID("$OpenBSD: session.c,v 1.76 2001/05/19 00:36:40 djm Exp $"); | |||
45 | #include "mpaux.h" | 45 | #include "mpaux.h" |
46 | #include "uidswap.h" | 46 | #include "uidswap.h" |
47 | #include "compat.h" | 47 | #include "compat.h" |
48 | #include "channels.h" | 48 | #include "channel.h" |
49 | #include "nchan.h" | ||
50 | #include "bufaux.h" | 49 | #include "bufaux.h" |
51 | #include "auth.h" | 50 | #include "auth.h" |
52 | #include "auth-options.h" | 51 | #include "auth-options.h" |
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: ssh.c,v 1.120 2001/05/28 08:04:39 markus Exp $"); | 42 | RCSID("$OpenBSD: ssh.c,v 1.121 2001/05/30 12:55:13 markus Exp $"); |
43 | 43 | ||
44 | #include <openssl/evp.h> | 44 | #include <openssl/evp.h> |
45 | #include <openssl/err.h> | 45 | #include <openssl/err.h> |
@@ -53,7 +53,7 @@ RCSID("$OpenBSD: ssh.c,v 1.120 2001/05/28 08:04:39 markus Exp $"); | |||
53 | #include "packet.h" | 53 | #include "packet.h" |
54 | #include "buffer.h" | 54 | #include "buffer.h" |
55 | #include "uidswap.h" | 55 | #include "uidswap.h" |
56 | #include "channels.h" | 56 | #include "channel.h" |
57 | #include "key.h" | 57 | #include "key.h" |
58 | #include "authfd.h" | 58 | #include "authfd.h" |
59 | #include "authfile.h" | 59 | #include "authfile.h" |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh1.h,v 1.2 2001/01/29 01:58:18 niklas Exp $ */ | 1 | /* $OpenBSD: ssh1.h,v 1.3 2001/05/30 12:55:13 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -66,6 +66,10 @@ | |||
66 | #define SSH_CMSG_HAVE_KERBEROS_TGT 44 /* credentials (s) */ | 66 | #define SSH_CMSG_HAVE_KERBEROS_TGT 44 /* credentials (s) */ |
67 | #define SSH_CMSG_HAVE_AFS_TOKEN 65 /* token (s) */ | 67 | #define SSH_CMSG_HAVE_AFS_TOKEN 65 /* token (s) */ |
68 | 68 | ||
69 | /* protocol version 1.5 overloads some version 1.3 message types */ | ||
70 | #define SSH_MSG_CHANNEL_INPUT_EOF SSH_MSG_CHANNEL_CLOSE | ||
71 | #define SSH_MSG_CHANNEL_OUTPUT_CLOSE SSH_MSG_CHANNEL_CLOSE_CONFIRMATION | ||
72 | |||
69 | /* | 73 | /* |
70 | * Authentication methods. New types can be added, but old types should not | 74 | * Authentication methods. New types can be added, but old types should not |
71 | * be removed for compatibility. The maximum allowed value is 31. | 75 | * be removed for compatibility. The maximum allowed value is 31. |
@@ -83,4 +87,3 @@ | |||
83 | /* Protocol flags. These are bit masks. */ | 87 | /* Protocol flags. These are bit masks. */ |
84 | #define SSH_PROTOFLAG_SCREEN_NUMBER 1 /* X11 forwarding includes screen */ | 88 | #define SSH_PROTOFLAG_SCREEN_NUMBER 1 /* X11 forwarding includes screen */ |
85 | #define SSH_PROTOFLAG_HOST_IN_FWD_OPEN 2 /* forwarding opens contain host */ | 89 | #define SSH_PROTOFLAG_HOST_IN_FWD_OPEN 2 /* forwarding opens contain host */ |
86 | |||