summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-04-16 11:18:38 +1000
committerDamien Miller <djm@mindrot.org>2000-04-16 11:18:38 +1000
commit4af51306d9a51459a5bef922df1037f876ae51fe (patch)
tree09ecfc215fce82345a3259f8a0f384b9a67906f0 /servconf.c
parent5d1705ecf9bd3216dc99a84242bcdf2e7297d307 (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 'servconf.c')
-rw-r--r--servconf.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/servconf.c b/servconf.c
index 918fb8ed2..fe72d2757 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,18 +1,18 @@
1/* 1/*
2 * 2 *
3 * servconf.c 3 * servconf.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: Mon Aug 21 15:48:58 1995 ylo 10 * Created: Mon Aug 21 15:48:58 1995 ylo
11 * 11 *
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$Id: servconf.c,v 1.11 2000/04/12 10:17:40 damien Exp $"); 15RCSID("$Id: servconf.c,v 1.12 2000/04/16 01:18:45 damien Exp $");
16 16
17#include "ssh.h" 17#include "ssh.h"
18#include "servconf.h" 18#include "servconf.h"
@@ -24,7 +24,7 @@ void add_listen_addr(ServerOptions *options, char *addr);
24 24
25/* Initializes the server options to their default values. */ 25/* Initializes the server options to their default values. */
26 26
27void 27void
28initialize_server_options(ServerOptions *options) 28initialize_server_options(ServerOptions *options)
29{ 29{
30 memset(options, 0, sizeof(*options)); 30 memset(options, 0, sizeof(*options));
@@ -73,7 +73,7 @@ initialize_server_options(ServerOptions *options)
73 options->protocol = SSH_PROTO_UNKNOWN; 73 options->protocol = SSH_PROTO_UNKNOWN;
74} 74}
75 75
76void 76void
77fill_default_server_options(ServerOptions *options) 77fill_default_server_options(ServerOptions *options)
78{ 78{
79 if (options->num_ports == 0) 79 if (options->num_ports == 0)
@@ -226,7 +226,7 @@ static struct {
226 * returns if the token is not known. 226 * returns if the token is not known.
227 */ 227 */
228 228
229static ServerOpCodes 229static ServerOpCodes
230parse_token(const char *cp, const char *filename, 230parse_token(const char *cp, const char *filename,
231 int linenum) 231 int linenum)
232{ 232{
@@ -244,7 +244,7 @@ parse_token(const char *cp, const char *filename,
244/* 244/*
245 * add listen address 245 * add listen address
246 */ 246 */
247void 247void
248add_listen_addr(ServerOptions *options, char *addr) 248add_listen_addr(ServerOptions *options, char *addr)
249{ 249{
250 extern int IPv4or6; 250 extern int IPv4or6;
@@ -274,7 +274,7 @@ add_listen_addr(ServerOptions *options, char *addr)
274 274
275/* Reads the server configuration file. */ 275/* Reads the server configuration file. */
276 276
277void 277void
278read_server_config(ServerOptions *options, const char *filename) 278read_server_config(ServerOptions *options, const char *filename)
279{ 279{
280 FILE *f; 280 FILE *f;
@@ -310,7 +310,7 @@ read_server_config(ServerOptions *options, const char *filename)
310 "ListenAdress.\n", filename, linenum); 310 "ListenAdress.\n", filename, linenum);
311 if (options->num_ports >= MAX_PORTS) 311 if (options->num_ports >= MAX_PORTS)
312 fatal("%s line %d: too many ports.\n", 312 fatal("%s line %d: too many ports.\n",
313 filename, linenum); 313 filename, linenum);
314 cp = strtok(NULL, WHITESPACE); 314 cp = strtok(NULL, WHITESPACE);
315 if (!cp) 315 if (!cp)
316 fatal("%s line %d: missing port number.\n", 316 fatal("%s line %d: missing port number.\n",