summaryrefslogtreecommitdiff
path: root/readconf.h
diff options
context:
space:
mode:
Diffstat (limited to 'readconf.h')
-rw-r--r--readconf.h25
1 files changed, 8 insertions, 17 deletions
diff --git a/readconf.h b/readconf.h
index 75e3f8f7a..0b9cb777a 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
21typedef 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
35struct allowed_cname { 26struct 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. */
@@ -106,11 +97,11 @@ typedef struct {
106 97
107 /* Local TCP/IP forward requests. */ 98 /* Local TCP/IP forward requests. */
108 int num_local_forwards; 99 int num_local_forwards;
109 Forward *local_forwards; 100 struct Forward *local_forwards;
110 101
111 /* Remote TCP/IP forward requests. */ 102 /* Remote TCP/IP forward requests. */
112 int num_remote_forwards; 103 int num_remote_forwards;
113 Forward *remote_forwards; 104 struct Forward *remote_forwards;
114 int clear_forwardings; 105 int clear_forwardings;
115 106
116 int enable_ssh_keysign; 107 int enable_ssh_keysign;
@@ -181,12 +172,12 @@ int process_config_line(Options *, struct passwd *, const char *, char *,
181 const char *, int, int *, int); 172 const char *, int, int *, int);
182int read_config_file(const char *, struct passwd *, const char *, 173int read_config_file(const char *, struct passwd *, const char *,
183 Options *, int); 174 Options *, int);
184int parse_forward(Forward *, const char *, int, int); 175int parse_forward(struct Forward *, const char *, int, int);
185int default_ssh_port(void); 176int default_ssh_port(void);
186int option_clear_or_none(const char *); 177int option_clear_or_none(const char *);
187 178
188void add_local_forward(Options *, const Forward *); 179void add_local_forward(Options *, const struct Forward *);
189void add_remote_forward(Options *, const Forward *); 180void add_remote_forward(Options *, const struct Forward *);
190void add_identity_file(Options *, const char *, const char *, int); 181void add_identity_file(Options *, const char *, const char *, int);
191 182
192#endif /* READCONF_H */ 183#endif /* READCONF_H */