diff options
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/readconf.h b/readconf.h index 5cc97f0da..0e298898a 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.101 2014/02/23 20:11:36 djm Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.102 2014/07/15 15:54:14 millert Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -16,21 +16,12 @@ | |||
16 | #ifndef READCONF_H | 16 | #ifndef READCONF_H |
17 | #define READCONF_H | 17 | #define READCONF_H |
18 | 18 | ||
19 | /* Data structure for representing a forwarding request. */ | ||
20 | |||
21 | typedef struct { | ||
22 | char *listen_host; /* Host (address) to listen on. */ | ||
23 | int listen_port; /* Port to forward. */ | ||
24 | char *connect_host; /* Host to connect. */ | ||
25 | int connect_port; /* Port to connect on connect_host. */ | ||
26 | int allocated_port; /* Dynamically allocated listen port */ | ||
27 | int handle; /* Handle for dynamic listen ports */ | ||
28 | } Forward; | ||
29 | /* Data structure for representing option data. */ | 19 | /* Data structure for representing option data. */ |
30 | 20 | ||
31 | #define MAX_SEND_ENV 256 | 21 | #define MAX_SEND_ENV 256 |
32 | #define SSH_MAX_HOSTS_FILES 32 | 22 | #define SSH_MAX_HOSTS_FILES 32 |
33 | #define MAX_CANON_DOMAINS 32 | 23 | #define MAX_CANON_DOMAINS 32 |
24 | #define PATH_MAX_SUN (sizeof((struct sockaddr_un *)0)->sun_path) | ||
34 | 25 | ||
35 | struct allowed_cname { | 26 | struct allowed_cname { |
36 | char *source_list; | 27 | char *source_list; |
@@ -44,7 +35,7 @@ typedef struct { | |||
44 | int forward_x11_trusted; /* Trust Forward X11 display. */ | 35 | int forward_x11_trusted; /* Trust Forward X11 display. */ |
45 | int exit_on_forward_failure; /* Exit if bind(2) fails for -L/-R */ | 36 | int exit_on_forward_failure; /* Exit if bind(2) fails for -L/-R */ |
46 | char *xauth_location; /* Location for xauth program */ | 37 | char *xauth_location; /* Location for xauth program */ |
47 | int gateway_ports; /* Allow remote connects to forwarded ports. */ | 38 | struct ForwardOptions fwd_opts; /* forwarding options */ |
48 | int use_privileged_port; /* Don't use privileged port if false. */ | 39 | int use_privileged_port; /* Don't use privileged port if false. */ |
49 | int rhosts_rsa_authentication; /* Try rhosts with RSA | 40 | int rhosts_rsa_authentication; /* Try rhosts with RSA |
50 | * authentication. */ | 41 | * authentication. */ |
@@ -111,11 +102,11 @@ typedef struct { | |||
111 | 102 | ||
112 | /* Local TCP/IP forward requests. */ | 103 | /* Local TCP/IP forward requests. */ |
113 | int num_local_forwards; | 104 | int num_local_forwards; |
114 | Forward *local_forwards; | 105 | struct Forward *local_forwards; |
115 | 106 | ||
116 | /* Remote TCP/IP forward requests. */ | 107 | /* Remote TCP/IP forward requests. */ |
117 | int num_remote_forwards; | 108 | int num_remote_forwards; |
118 | Forward *remote_forwards; | 109 | struct Forward *remote_forwards; |
119 | int clear_forwardings; | 110 | int clear_forwardings; |
120 | 111 | ||
121 | int enable_ssh_keysign; | 112 | int enable_ssh_keysign; |
@@ -186,12 +177,12 @@ int process_config_line(Options *, struct passwd *, const char *, char *, | |||
186 | const char *, int, int *, int); | 177 | const char *, int, int *, int); |
187 | int read_config_file(const char *, struct passwd *, const char *, | 178 | int read_config_file(const char *, struct passwd *, const char *, |
188 | Options *, int); | 179 | Options *, int); |
189 | int parse_forward(Forward *, const char *, int, int); | 180 | int parse_forward(struct Forward *, const char *, int, int); |
190 | int default_ssh_port(void); | 181 | int default_ssh_port(void); |
191 | int option_clear_or_none(const char *); | 182 | int option_clear_or_none(const char *); |
192 | 183 | ||
193 | void add_local_forward(Options *, const Forward *); | 184 | void add_local_forward(Options *, const struct Forward *); |
194 | void add_remote_forward(Options *, const Forward *); | 185 | void add_remote_forward(Options *, const struct Forward *); |
195 | void add_identity_file(Options *, const char *, const char *, int); | 186 | void add_identity_file(Options *, const char *, const char *, int); |
196 | 187 | ||
197 | #endif /* READCONF_H */ | 188 | #endif /* READCONF_H */ |