upstream: Add a sshd_config "Include" directive to allow inclusion

of files. This has sensible semantics wrt Match blocks and accepts glob(3)
patterns to specify the included files. Based on patch by Jakub Jelen in
bz2468; feedback and ok markus@

OpenBSD-Commit-ID: 36ed0e845b872e33f03355b936a4fff02d5794ff

1 files changed, 16 insertions, 4 deletions

diff --git a/servconf.h b/servconf.h
index 6fc1efb2c..deda09d93 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.142 2019/12/15 18:57:30 djm Exp $ */
+/* $OpenBSD: servconf.h,v 1.143 2020/01/31 22:42:45 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -16,6 +16,8 @@
 #ifndef SERVCONF_H
 #define SERVCONF_H
 
+#include <sys/queue.h>
+
 #define MAX_PORTS               256     /* Max # ports. */
 
 #define MAX_SUBSYSTEMS          256     /* Max # subsystems. */
@@ -230,6 +232,15 @@ struct connection_info {
                                  * unspecified */
 };
 
+/* List of included files for re-exec from the parsed configuration */
+struct include_item {
+        char *selector;
+        char *filename;
+        struct sshbuf *contents;
+        TAILQ_ENTRY(include_item) entry;
+};
+TAILQ_HEAD(include_list, include_item);
+
 
 /*
  * These are string config options that must be copied between the
@@ -269,12 +280,13 @@ struct connection_info *get_connection_info(struct ssh *, int, int);
 void     initialize_server_options(ServerOptions *);
 void     fill_default_server_options(ServerOptions *);
 int      process_server_config_line(ServerOptions *, char *, const char *, int,
-             int *, struct connection_info *);
+             int *, struct connection_info *, struct include_list *includes);
 void     process_permitopen(struct ssh *ssh, ServerOptions *options);
 void     load_server_config(const char *, struct sshbuf *);
 void     parse_server_config(ServerOptions *, const char *, struct sshbuf *,
-             struct connection_info *);
-void     parse_server_match_config(ServerOptions *, struct connection_info *);
+             struct include_list *includes, struct connection_info *);
+void     parse_server_match_config(ServerOptions *,
+             struct include_list *includes, struct connection_info *);
 int      parse_server_match_testspec(struct connection_info *, char *);
 int      server_match_spec_complete(struct connection_info *);
 void     copy_set_server_options(ServerOptions *, ServerOptions *, int);