diff options
author | Damien Miller <djm@mindrot.org> | 2000-04-16 11:18:38 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-04-16 11:18:38 +1000 |
commit | 4af51306d9a51459a5bef922df1037f876ae51fe (patch) | |
tree | 09ecfc215fce82345a3259f8a0f384b9a67906f0 /readconf.c | |
parent | 5d1705ecf9bd3216dc99a84242bcdf2e7297d307 (diff) |
- OpenBSD CVS updates.
[ssh.1 ssh.c]
- ssh -2
[auth.c channels.c clientloop.c packet.c packet.h serverloop.c]
[session.c sshconnect.c]
- check payload for (illegal) extra data
[ALL]
- whitespace cleanup
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/readconf.c b/readconf.c index 1ba70c36a..3b75290f3 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,20 +1,20 @@ | |||
1 | /* | 1 | /* |
2 | * | 2 | * |
3 | * readconf.c | 3 | * readconf.c |
4 | * | 4 | * |
5 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 5 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
6 | * | 6 | * |
7 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 7 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
8 | * All rights reserved | 8 | * All rights reserved |
9 | * | 9 | * |
10 | * Created: Sat Apr 22 00:03:10 1995 ylo | 10 | * Created: Sat Apr 22 00:03:10 1995 ylo |
11 | * | 11 | * |
12 | * Functions for reading the configuration files. | 12 | * Functions for reading the configuration files. |
13 | * | 13 | * |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$Id: readconf.c,v 1.10 2000/04/12 10:17:40 damien Exp $"); | 17 | RCSID("$Id: readconf.c,v 1.11 2000/04/16 01:18:44 damien Exp $"); |
18 | 18 | ||
19 | #include "ssh.h" | 19 | #include "ssh.h" |
20 | #include "cipher.h" | 20 | #include "cipher.h" |
@@ -167,7 +167,7 @@ static struct { | |||
167 | * error. | 167 | * error. |
168 | */ | 168 | */ |
169 | 169 | ||
170 | void | 170 | void |
171 | add_local_forward(Options *options, u_short port, const char *host, | 171 | add_local_forward(Options *options, u_short port, const char *host, |
172 | u_short host_port) | 172 | u_short host_port) |
173 | { | 173 | { |
@@ -188,7 +188,7 @@ add_local_forward(Options *options, u_short port, const char *host, | |||
188 | * an error. | 188 | * an error. |
189 | */ | 189 | */ |
190 | 190 | ||
191 | void | 191 | void |
192 | add_remote_forward(Options *options, u_short port, const char *host, | 192 | add_remote_forward(Options *options, u_short port, const char *host, |
193 | u_short host_port) | 193 | u_short host_port) |
194 | { | 194 | { |
@@ -207,7 +207,7 @@ add_remote_forward(Options *options, u_short port, const char *host, | |||
207 | * returns if the token is not known. | 207 | * returns if the token is not known. |
208 | */ | 208 | */ |
209 | 209 | ||
210 | static OpCodes | 210 | static OpCodes |
211 | parse_token(const char *cp, const char *filename, int linenum) | 211 | parse_token(const char *cp, const char *filename, int linenum) |
212 | { | 212 | { |
213 | unsigned int i; | 213 | unsigned int i; |
@@ -567,7 +567,7 @@ parse_int: | |||
567 | * there is an error. If the file does not exist, this returns immediately. | 567 | * there is an error. If the file does not exist, this returns immediately. |
568 | */ | 568 | */ |
569 | 569 | ||
570 | void | 570 | void |
571 | read_config_file(const char *filename, const char *host, Options *options) | 571 | read_config_file(const char *filename, const char *host, Options *options) |
572 | { | 572 | { |
573 | FILE *f; | 573 | FILE *f; |
@@ -607,7 +607,7 @@ read_config_file(const char *filename, const char *host, Options *options) | |||
607 | * system config file. Last, fill_default_options is called. | 607 | * system config file. Last, fill_default_options is called. |
608 | */ | 608 | */ |
609 | 609 | ||
610 | void | 610 | void |
611 | initialize_options(Options * options) | 611 | initialize_options(Options * options) |
612 | { | 612 | { |
613 | memset(options, 'X', sizeof(*options)); | 613 | memset(options, 'X', sizeof(*options)); |
@@ -658,7 +658,7 @@ initialize_options(Options * options) | |||
658 | * options for which no value has been specified with their default values. | 658 | * options for which no value has been specified with their default values. |
659 | */ | 659 | */ |
660 | 660 | ||
661 | void | 661 | void |
662 | fill_default_options(Options * options) | 662 | fill_default_options(Options * options) |
663 | { | 663 | { |
664 | if (options->forward_agent == -1) | 664 | if (options->forward_agent == -1) |