diff options
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/servconf.h b/servconf.h index ab82c8f57..8a5b950ea 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.h,v 1.72 2005/12/06 22:38:27 reyk Exp $ */ | 1 | /* $OpenBSD: servconf.h,v 1.80 2007/02/19 10:45:58 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -16,8 +16,6 @@ | |||
16 | #ifndef SERVCONF_H | 16 | #ifndef SERVCONF_H |
17 | #define SERVCONF_H | 17 | #define SERVCONF_H |
18 | 18 | ||
19 | #include "buffer.h" | ||
20 | |||
21 | #define MAX_PORTS 256 /* Max # ports. */ | 19 | #define MAX_PORTS 256 /* Max # ports. */ |
22 | 20 | ||
23 | #define MAX_ALLOW_USERS 256 /* Max # users on allow list. */ | 21 | #define MAX_ALLOW_USERS 256 /* Max # users on allow list. */ |
@@ -27,6 +25,7 @@ | |||
27 | #define MAX_SUBSYSTEMS 256 /* Max # subsystems. */ | 25 | #define MAX_SUBSYSTEMS 256 /* Max # subsystems. */ |
28 | #define MAX_HOSTKEYS 256 /* Max # hostkeys. */ | 26 | #define MAX_HOSTKEYS 256 /* Max # hostkeys. */ |
29 | #define MAX_ACCEPT_ENV 256 /* Max # of env vars. */ | 27 | #define MAX_ACCEPT_ENV 256 /* Max # of env vars. */ |
28 | #define MAX_MATCH_GROUPS 256 /* Max # of groups for Match. */ | ||
30 | 29 | ||
31 | /* permit_root_login */ | 30 | /* permit_root_login */ |
32 | #define PERMIT_NOT_SET -1 | 31 | #define PERMIT_NOT_SET -1 |
@@ -111,6 +110,7 @@ typedef struct { | |||
111 | u_int num_subsystems; | 110 | u_int num_subsystems; |
112 | char *subsystem_name[MAX_SUBSYSTEMS]; | 111 | char *subsystem_name[MAX_SUBSYSTEMS]; |
113 | char *subsystem_command[MAX_SUBSYSTEMS]; | 112 | char *subsystem_command[MAX_SUBSYSTEMS]; |
113 | char *subsystem_args[MAX_SUBSYSTEMS]; | ||
114 | 114 | ||
115 | u_int num_accept_env; | 115 | u_int num_accept_env; |
116 | char *accept_env[MAX_ACCEPT_ENV]; | 116 | char *accept_env[MAX_ACCEPT_ENV]; |
@@ -134,15 +134,24 @@ typedef struct { | |||
134 | char *authorized_keys_file; /* File containing public keys */ | 134 | char *authorized_keys_file; /* File containing public keys */ |
135 | char *authorized_keys_file2; | 135 | char *authorized_keys_file2; |
136 | 136 | ||
137 | char *adm_forced_command; | ||
138 | |||
137 | int use_pam; /* Enable auth via PAM */ | 139 | int use_pam; /* Enable auth via PAM */ |
138 | 140 | ||
139 | int permit_tun; | 141 | int permit_tun; |
142 | |||
143 | int num_permitted_opens; | ||
140 | } ServerOptions; | 144 | } ServerOptions; |
141 | 145 | ||
142 | void initialize_server_options(ServerOptions *); | 146 | void initialize_server_options(ServerOptions *); |
143 | void fill_default_server_options(ServerOptions *); | 147 | void fill_default_server_options(ServerOptions *); |
144 | int process_server_config_line(ServerOptions *, char *, const char *, int); | 148 | int process_server_config_line(ServerOptions *, char *, const char *, int, |
149 | int *, const char *, const char *, const char *); | ||
145 | void load_server_config(const char *, Buffer *); | 150 | void load_server_config(const char *, Buffer *); |
146 | void parse_server_config(ServerOptions *, const char *, Buffer *); | 151 | void parse_server_config(ServerOptions *, const char *, Buffer *, |
152 | const char *, const char *, const char *); | ||
153 | void parse_server_match_config(ServerOptions *, const char *, const char *, | ||
154 | const char *); | ||
155 | void copy_set_server_options(ServerOptions *, ServerOptions *, int); | ||
147 | 156 | ||
148 | #endif /* SERVCONF_H */ | 157 | #endif /* SERVCONF_H */ |