summaryrefslogtreecommitdiff
path: root/readconf.h
diff options
context:
space:
mode:
Diffstat (limited to 'readconf.h')
-rw-r--r--readconf.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/readconf.h b/readconf.h
index f4d9e2b26..c56887816 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.127 2018/07/19 10:28:47 dtucker 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)
@@ -36,7 +35,6 @@ typedef struct {
36 int exit_on_forward_failure; /* Exit if bind(2) fails for -L/-R */ 35 int exit_on_forward_failure; /* Exit if bind(2) fails for -L/-R */
37 char *xauth_location; /* Location for xauth program */ 36 char *xauth_location; /* Location for xauth program */
38 struct ForwardOptions fwd_opts; /* forwarding options */ 37 struct ForwardOptions fwd_opts; /* forwarding options */
39 int use_privileged_port; /* Don't use privileged port if false. */
40 int pubkey_authentication; /* Try ssh2 pubkey authentication. */ 38 int pubkey_authentication; /* Try ssh2 pubkey authentication. */
41 int hostbased_authentication; /* ssh2's rhosts_rsa */ 39 int hostbased_authentication; /* ssh2's rhosts_rsa */
42 int challenge_response_authentication; 40 int challenge_response_authentication;
@@ -120,7 +118,9 @@ typedef struct {
120 int server_alive_count_max; 118 int server_alive_count_max;
121 119
122 int num_send_env; 120 int num_send_env;
123 char *send_env[MAX_SEND_ENV]; 121 char **send_env;
122 int num_setenv;
123 char **setenv;
124 124
125 char *control_path; 125 char *control_path;
126 int control_master; 126 int control_master;