summaryrefslogtreecommitdiff
path: root/servconf.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2019-06-05 06:41:44 +0100
committerColin Watson <cjwatson@debian.org>2019-06-05 06:41:44 +0100
commit102062f825fb26a74295a1c089c00c4c4c76b68a (patch)
tree3db66bc8c8483cce66516dff36f6ef56065143d9 /servconf.h
parent3d246f10429fc9a37b98eabef94fe8dc7c61002b (diff)
parentfd0fa130ecf06d7d092932adcd5d77f1549bfc8d (diff)
Import openssh_8.0p1.orig.tar.gz
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/servconf.h b/servconf.h
index 0175e00e8..54e0a8d8d 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.h,v 1.137 2018/09/20 03:28:06 djm Exp $ */ 1/* $OpenBSD: servconf.h,v 1.139 2019/01/19 21:37:48 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -75,6 +75,7 @@ typedef struct {
75 char *routing_domain; /* Bind session to routing domain */ 75 char *routing_domain; /* Bind session to routing domain */
76 76
77 char **host_key_files; /* Files containing host keys. */ 77 char **host_key_files; /* Files containing host keys. */
78 int *host_key_file_userprovided; /* Key was specified by user. */
78 u_int num_host_key_files; /* Number of files for host keys. */ 79 u_int num_host_key_files; /* Number of files for host keys. */
79 char **host_cert_files; /* Files containing host certs. */ 80 char **host_cert_files; /* Files containing host certs. */
80 u_int num_host_cert_files; /* Number of files for host certs. */ 81 u_int num_host_cert_files; /* Number of files for host certs. */
@@ -257,7 +258,7 @@ struct connection_info {
257 M_CP_STRARRAYOPT(permitted_listens, num_permitted_listens); \ 258 M_CP_STRARRAYOPT(permitted_listens, num_permitted_listens); \
258 } while (0) 259 } while (0)
259 260
260struct connection_info *get_connection_info(int, int); 261struct connection_info *get_connection_info(struct ssh *, int, int);
261void initialize_server_options(ServerOptions *); 262void initialize_server_options(ServerOptions *);
262void fill_default_server_options(ServerOptions *); 263void fill_default_server_options(ServerOptions *);
263int process_server_config_line(ServerOptions *, char *, const char *, int, 264int process_server_config_line(ServerOptions *, char *, const char *, int,
@@ -273,7 +274,7 @@ void copy_set_server_options(ServerOptions *, ServerOptions *, int);
273void dump_config(ServerOptions *); 274void dump_config(ServerOptions *);
274char *derelativise_path(const char *); 275char *derelativise_path(const char *);
275void servconf_add_hostkey(const char *, const int, 276void servconf_add_hostkey(const char *, const int,
276 ServerOptions *, const char *path); 277 ServerOptions *, const char *path, int);
277void servconf_add_hostcert(const char *, const int, 278void servconf_add_hostcert(const char *, const int,
278 ServerOptions *, const char *path); 279 ServerOptions *, const char *path);
279 280