summaryrefslogtreecommitdiff
path: root/servconf.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-06-09 03:03:10 +0000
committerDamien Miller <djm@mindrot.org>2018-06-09 13:11:00 +1000
commit28013759f09ed3ebf7e8335e83a62936bd7a7f47 (patch)
tree11704fdf59dbe3ebfe0151cbe82eb0847e12b420 /servconf.h
parent7082bb58a2eb878d23ec674587c742e5e9673c36 (diff)
downloadopenssh-git-28013759f09ed3ebf7e8335e83a62936bd7a7f47.tar.gz
upstream: add a SetEnv directive for sshd_config to allow an
administrator to explicitly specify environment variables set in sessions started by sshd. These override the default environment and any variables set by user configuration (PermitUserEnvironment, etc), but not the SSH_* variables set by sshd itself. ok markus@ OpenBSD-Commit-ID: b6a96c0001ccd7dd211df6cae9e961c20fd718c0
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h
index 450b94ec..db8362c6 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.133 2018/06/06 18:23:32 djm Exp $ */
+/* $OpenBSD: servconf.h,v 1.134 2018/06/09 03:03:10 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -154,6 +154,8 @@ typedef struct {
u_int num_accept_env;
char **accept_env;
+ u_int num_setenv;
+ char **setenv;
int max_startups_begin;
int max_startups_rate;