summaryrefslogtreecommitdiff
path: root/readconf.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-06-09 03:01:12 +0000
committerDamien Miller <djm@mindrot.org>2018-06-09 13:11:00 +1000
commit7082bb58a2eb878d23ec674587c742e5e9673c36 (patch)
treeca7c8ddb616358d96279fdbfd5986328f48a1821 /readconf.h
parent3b9798bda15bd3f598f5ef07595d64e23504da91 (diff)
upstream: add a SetEnv directive to ssh_config that allows setting
environment variables for the remote session (subject to the server accepting them) refactor SendEnv to remove the arbitrary limit of variable names. ok markus@ OpenBSD-Commit-ID: cfbb00d9b0e10c1ffff1d83424351fd961d1f2be
Diffstat (limited to 'readconf.h')
-rw-r--r--readconf.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/readconf.h b/readconf.h
index f4d9e2b26..d8595f07e 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.h,v 1.125 2018/02/23 02:34:33 djm Exp $ */ 1/* $OpenBSD: readconf.h,v 1.126 2018/06/09 03:01:12 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -18,7 +18,6 @@
18 18
19/* Data structure for representing option data. */ 19/* Data structure for representing option data. */
20 20
21#define MAX_SEND_ENV 256
22#define SSH_MAX_HOSTS_FILES 32 21#define SSH_MAX_HOSTS_FILES 32
23#define MAX_CANON_DOMAINS 32 22#define MAX_CANON_DOMAINS 32
24#define PATH_MAX_SUN (sizeof((struct sockaddr_un *)0)->sun_path) 23#define PATH_MAX_SUN (sizeof((struct sockaddr_un *)0)->sun_path)
@@ -120,7 +119,9 @@ typedef struct {
120 int server_alive_count_max; 119 int server_alive_count_max;
121 120
122 int num_send_env; 121 int num_send_env;
123 char *send_env[MAX_SEND_ENV]; 122 char **send_env;
123 int num_setenv;
124 char **setenv;
124 125
125 char *control_path; 126 char *control_path;
126 int control_master; 127 int control_master;