diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | auth-options.c | 4 | ||||
-rw-r--r-- | auth2.c | 4 | ||||
-rw-r--r-- | clientloop.c | 4 | ||||
-rw-r--r-- | packet.c | 4 | ||||
-rw-r--r-- | serverloop.c | 4 | ||||
-rw-r--r-- | session.c | 4 | ||||
-rw-r--r-- | ssh.c | 4 |
8 files changed, 20 insertions, 15 deletions
@@ -7,6 +7,11 @@ | |||
7 | - markus@cvs.openbsd.org 2001/05/30 15:20:10 | 7 | - markus@cvs.openbsd.org 2001/05/30 15:20:10 |
8 | [ssh.c] | 8 | [ssh.c] |
9 | merge functions, simplify. | 9 | merge functions, simplify. |
10 | - markus@cvs.openbsd.org 2001/05/31 10:30:17 | ||
11 | [auth-options.c auth2.c channels.c channels.h clientloop.c nchan.c | ||
12 | packet.c serverloop.c session.c ssh.c] | ||
13 | undo the .c file split, just merge the header and keep the cvs | ||
14 | history | ||
10 | 15 | ||
11 | 20010606 | 16 | 20010606 |
12 | - OpenBSD CVS Sync | 17 | - OpenBSD CVS Sync |
@@ -5518,4 +5523,4 @@ | |||
5518 | - Wrote replacements for strlcpy and mkdtemp | 5523 | - Wrote replacements for strlcpy and mkdtemp |
5519 | - Released 1.0pre1 | 5524 | - Released 1.0pre1 |
5520 | 5525 | ||
5521 | $Id: ChangeLog,v 1.1248 2001/06/09 00:18:51 mouring Exp $ | 5526 | $Id: ChangeLog,v 1.1249 2001/06/09 00:36:26 mouring Exp $ |
diff --git a/auth-options.c b/auth-options.c index d6258ab1a..210fbe7ea 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.17 2001/05/30 12:55:06 markus Exp $"); | 13 | RCSID("$OpenBSD: auth-options.c,v 1.18 2001/05/31 10:30:12 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 "channel.h" | 20 | #include "channels.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.60 2001/05/30 23:31:14 markus Exp $"); | 26 | RCSID("$OpenBSD: auth2.c,v 1.61 2001/05/31 10:30:12 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.60 2001/05/30 23:31:14 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 "channel.h" | 39 | #include "channels.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 59a556a88..70abee8fd 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.73 2001/05/30 12:55:10 markus Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.74 2001/05/31 10:30:15 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.73 2001/05/30 12:55:10 markus 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 "channel.h" | 71 | #include "channels.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.63 2001/05/30 12:55:11 markus Exp $"); | 40 | RCSID("$OpenBSD: packet.c,v 1.64 2001/05/31 10:30:16 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.63 2001/05/30 12:55:11 markus Exp $"); | |||
48 | 48 | ||
49 | #include "compress.h" | 49 | #include "compress.h" |
50 | #include "deattack.h" | 50 | #include "deattack.h" |
51 | #include "channel.h" | 51 | #include "channels.h" |
52 | 52 | ||
53 | #include "compat.h" | 53 | #include "compat.h" |
54 | #include "ssh1.h" | 54 | #include "ssh1.h" |
diff --git a/serverloop.c b/serverloop.c index 5f50b4ee7..d8026ec5a 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.66 2001/05/30 12:55:12 markus Exp $"); | 38 | RCSID("$OpenBSD: serverloop.c,v 1.67 2001/05/31 10:30:16 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.66 2001/05/30 12:55:12 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 "channel.h" | 46 | #include "channels.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.77 2001/05/30 12:55:13 markus Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.78 2001/05/31 10:30:16 markus Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -45,7 +45,7 @@ RCSID("$OpenBSD: session.c,v 1.77 2001/05/30 12:55:13 markus 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 "channel.h" | 48 | #include "channels.h" |
49 | #include "bufaux.h" | 49 | #include "bufaux.h" |
50 | #include "auth.h" | 50 | #include "auth.h" |
51 | #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.122 2001/05/30 15:20:10 markus Exp $"); | 42 | RCSID("$OpenBSD: ssh.c,v 1.123 2001/05/31 10:30:17 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.122 2001/05/30 15:20:10 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 "channel.h" | 56 | #include "channels.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" |