summaryrefslogtreecommitdiff
path: root/readconf.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2021-07-13 23:48:36 +0000
committerDamien Miller <djm@mindrot.org>2021-07-14 09:49:47 +1000
commiteda8909d1b0a85b9c3804a04d03ec6738fd9dc7f (patch)
tree67d608d9dfd6d927376414a40eaf1c9fac286a13 /readconf.h
parent7ae69f2628e338ba6e0eae7ee8a63bcf8fea7538 (diff)
downloadopenssh-git-eda8909d1b0a85b9c3804a04d03ec6738fd9dc7f.tar.gz
upstream: add a SessionType directive to ssh_config, allowing the
configuration file to offer equivalent control to the -N (no session) and -s (subsystem) command-line flags. Part of GHPR#231 by Volker Diels-Grabsch with some minor tweaks; feedback and ok dtucker@ OpenBSD-Commit-ID: 726ee931dd4c5cc7f1d7a187b26f41257f9a2d12
Diffstat (limited to 'readconf.h')
-rw-r--r--readconf.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h
index f3d02fb3..e4ebc6fb 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.141 2021/07/02 05:11:21 dtucker Exp $ */
+/* $OpenBSD: readconf.h,v 1.142 2021/07/13 23:48:36 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -146,6 +146,7 @@ typedef struct {
int visual_host_key;
int request_tty;
+ int session_type;
int proxy_use_fdpass;
@@ -191,6 +192,10 @@ typedef struct {
#define REQUEST_TTY_YES 2
#define REQUEST_TTY_FORCE 3
+#define SESSION_TYPE_NONE 0
+#define SESSION_TYPE_SUBSYSTEM 1
+#define SESSION_TYPE_DEFAULT 2
+
#define SSHCONF_CHECKPERM 1 /* check permissions on config file */
#define SSHCONF_USERCONF 2 /* user provided config file not system */
#define SSHCONF_FINAL 4 /* Final pass over config, after canon. */