summaryrefslogtreecommitdiff
path: root/servconf.h
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2018-07-09 21:26:02 +0000
committerDamien Miller <djm@mindrot.org>2018-07-10 15:21:58 +1000
commit2808d18ca47ad3d251836c555f0e22aaca03d15c (patch)
tree06bc9605dd843d77ee25187637e348369e59cb1d /servconf.h
parent89dd615b8b531979be63f05f9d5624367c9b28e6 (diff)
upstream: sshd: switch loginmsg to sshbuf API; ok djm@
OpenBSD-Commit-ID: f3cb4e54bff15c593602d95cc43e32ee1a4bac42
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/servconf.h b/servconf.h
index 73327135b..557521d73 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.h,v 1.135 2018/07/03 10:59:35 djm Exp $ */ 1/* $OpenBSD: servconf.h,v 1.136 2018/07/09 21:26:02 markus Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -261,8 +261,8 @@ void fill_default_server_options(ServerOptions *);
261int process_server_config_line(ServerOptions *, char *, const char *, int, 261int process_server_config_line(ServerOptions *, char *, const char *, int,
262 int *, struct connection_info *); 262 int *, struct connection_info *);
263void process_permitopen(struct ssh *ssh, ServerOptions *options); 263void process_permitopen(struct ssh *ssh, ServerOptions *options);
264void load_server_config(const char *, Buffer *); 264void load_server_config(const char *, struct sshbuf *);
265void parse_server_config(ServerOptions *, const char *, Buffer *, 265void parse_server_config(ServerOptions *, const char *, struct sshbuf *,
266 struct connection_info *); 266 struct connection_info *);
267void parse_server_match_config(ServerOptions *, struct connection_info *); 267void parse_server_match_config(ServerOptions *, struct connection_info *);
268int parse_server_match_testspec(struct connection_info *, char *); 268int parse_server_match_testspec(struct connection_info *, char *);