summaryrefslogtreecommitdiff
path: root/servconf.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2005-01-04 13:07:27 +0000
committerColin Watson <cjwatson@debian.org>2005-01-04 13:07:27 +0000
commitfd0f611b70a83d80fe8793af785542ee5541b7cd (patch)
treebededd22bb7eeec52e20083237ab7e4113445a16 /servconf.h
parentc44fe9a5b9d3db96a7249b04d915f17e4a3a3b04 (diff)
parentebd2ce335af5861020c79fddb1ae35c03bf036cf (diff)
Merge 3.9p1 to the trunk.
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/servconf.h b/servconf.h
index 57c7e5fab..ebd056814 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.h,v 1.67 2003/12/23 16:12:10 jakob Exp $ */ 1/* $OpenBSD: servconf.h,v 1.70 2004/06/24 19:30:54 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -16,6 +16,8 @@
16#ifndef SERVCONF_H 16#ifndef SERVCONF_H
17#define SERVCONF_H 17#define SERVCONF_H
18 18
19#include "buffer.h"
20
19#define MAX_PORTS 256 /* Max # ports. */ 21#define MAX_PORTS 256 /* Max # ports. */
20 22
21#define MAX_ALLOW_USERS 256 /* Max # users on allow list. */ 23#define MAX_ALLOW_USERS 256 /* Max # users on allow list. */
@@ -24,6 +26,7 @@
24#define MAX_DENY_GROUPS 256 /* Max # groups on deny list. */ 26#define MAX_DENY_GROUPS 256 /* Max # groups on deny list. */
25#define MAX_SUBSYSTEMS 256 /* Max # subsystems. */ 27#define MAX_SUBSYSTEMS 256 /* Max # subsystems. */
26#define MAX_HOSTKEYS 256 /* Max # hostkeys. */ 28#define MAX_HOSTKEYS 256 /* Max # hostkeys. */
29#define MAX_ACCEPT_ENV 256 /* Max # of env vars. */
27 30
28/* permit_root_login */ 31/* permit_root_login */
29#define PERMIT_NOT_SET -1 32#define PERMIT_NOT_SET -1
@@ -32,6 +35,7 @@
32#define PERMIT_NO_PASSWD 2 35#define PERMIT_NO_PASSWD 2
33#define PERMIT_YES 3 36#define PERMIT_YES 3
34 37
38#define DEFAULT_AUTH_FAIL_MAX 6 /* Default for MaxAuthTries */
35 39
36typedef struct { 40typedef struct {
37 u_int num_ports; 41 u_int num_ports;
@@ -107,9 +111,13 @@ typedef struct {
107 char *subsystem_name[MAX_SUBSYSTEMS]; 111 char *subsystem_name[MAX_SUBSYSTEMS];
108 char *subsystem_command[MAX_SUBSYSTEMS]; 112 char *subsystem_command[MAX_SUBSYSTEMS];
109 113
114 u_int num_accept_env;
115 char *accept_env[MAX_ACCEPT_ENV];
116
110 int max_startups_begin; 117 int max_startups_begin;
111 int max_startups_rate; 118 int max_startups_rate;
112 int max_startups; 119 int max_startups;
120 int max_authtries;
113 char *banner; /* SSH-2 banner message */ 121 char *banner; /* SSH-2 banner message */
114 int use_dns; 122 int use_dns;
115 int client_alive_interval; /* 123 int client_alive_interval; /*
@@ -128,9 +136,9 @@ typedef struct {
128} ServerOptions; 136} ServerOptions;
129 137
130void initialize_server_options(ServerOptions *); 138void initialize_server_options(ServerOptions *);
131void read_server_config(ServerOptions *, const char *);
132void fill_default_server_options(ServerOptions *); 139void fill_default_server_options(ServerOptions *);
133int process_server_config_line(ServerOptions *, char *, const char *, int); 140int process_server_config_line(ServerOptions *, char *, const char *, int);
134 141void load_server_config(const char *, Buffer *);
142void parse_server_config(ServerOptions *, const char *, Buffer *);
135 143
136#endif /* SERVCONF_H */ 144#endif /* SERVCONF_H */