summaryrefslogtreecommitdiff
path: root/servconf.h
diff options
context:
space:
mode:
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h
index 0cd78bc22..4f20ad595 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.h,v 1.87 2009/01/22 10:02:34 djm Exp $ */ 1/* $OpenBSD: servconf.h,v 1.92 2010/03/04 10:36:03 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -24,6 +24,7 @@
24#define MAX_DENY_GROUPS 256 /* Max # groups on deny list. */ 24#define MAX_DENY_GROUPS 256 /* Max # groups on deny list. */
25#define MAX_SUBSYSTEMS 256 /* Max # subsystems. */ 25#define MAX_SUBSYSTEMS 256 /* Max # subsystems. */
26#define MAX_HOSTKEYS 256 /* Max # hostkeys. */ 26#define MAX_HOSTKEYS 256 /* Max # hostkeys. */
27#define MAX_HOSTCERTS 256 /* Max # host certificates. */
27#define MAX_ACCEPT_ENV 256 /* Max # of env vars. */ 28#define MAX_ACCEPT_ENV 256 /* Max # of env vars. */
28#define MAX_MATCH_GROUPS 256 /* Max # of groups for Match. */ 29#define MAX_MATCH_GROUPS 256 /* Max # of groups for Match. */
29 30
@@ -49,6 +50,8 @@ typedef struct {
49 int address_family; /* Address family used by the server. */ 50 int address_family; /* Address family used by the server. */
50 char *host_key_files[MAX_HOSTKEYS]; /* Files containing host keys. */ 51 char *host_key_files[MAX_HOSTKEYS]; /* Files containing host keys. */
51 int num_host_key_files; /* Number of files for host keys. */ 52 int num_host_key_files; /* Number of files for host keys. */
53 char *host_cert_files[MAX_HOSTCERTS]; /* Files containing host certs. */
54 int num_host_cert_files; /* Number of files for host certs. */
52 char *pid_file; /* Where to put our pid */ 55 char *pid_file; /* Where to put our pid */
53 int server_key_bits;/* Size of the server key. */ 56 int server_key_bits;/* Size of the server key. */
54 int login_grace_time; /* Disconnect if no auth in this time 57 int login_grace_time; /* Disconnect if no auth in this time
@@ -157,6 +160,8 @@ typedef struct {
157 int debian_banner; 160 int debian_banner;
158 161
159 char *chroot_directory; 162 char *chroot_directory;
163 char *revoked_keys_file;
164 char *trusted_user_ca_keys;
160} ServerOptions; 165} ServerOptions;
161 166
162void initialize_server_options(ServerOptions *); 167void initialize_server_options(ServerOptions *);
@@ -170,5 +175,6 @@ void parse_server_match_config(ServerOptions *, const char *, const char *,
170 const char *); 175 const char *);
171void copy_set_server_options(ServerOptions *, ServerOptions *, int); 176void copy_set_server_options(ServerOptions *, ServerOptions *, int);
172void dump_config(ServerOptions *); 177void dump_config(ServerOptions *);
178char *derelativise_path(const char *);
173 179
174#endif /* SERVCONF_H */ 180#endif /* SERVCONF_H */