1 files changed, 27 insertions, 7 deletions

diff --git a/readconf.h b/readconf.h
index 675b35dfe..826c6767b 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.95 2013/05/16 04:27:50 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.99 2013/10/16 22:49:38 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -29,7 +29,13 @@ typedef struct {
 /* Data structure for representing option data. */
 
 #define MAX_SEND_ENV            256
-#define SSH_MAX_HOSTS_FILES     256
+#define SSH_MAX_HOSTS_FILES     32
+#define MAX_CANON_DOMAINS       32
+
+struct allowed_cname {
+        char *source_list;
+        char *target_list;
+};
 
 typedef struct {
         int     forward_agent;  /* Forward authentication agent. */
@@ -143,9 +149,23 @@ typedef struct {
 
         int     request_tty;
 
+        int     proxy_use_fdpass;
+
+        int     num_canonical_domains;
+        char    *canonical_domains[MAX_CANON_DOMAINS];
+        int     canonicalize_hostname;
+        int     canonicalize_max_dots;
+        int     canonicalize_fallback_local;
+        int     num_permitted_cnames;
+        struct allowed_cname permitted_cnames[MAX_CANON_DOMAINS];
+
         char    *ignored_unknown; /* Pattern list of unknown tokens to ignore */
 }       Options;
 
+#define SSH_CANONICALISE_NO     0
+#define SSH_CANONICALISE_YES    1
+#define SSH_CANONICALISE_ALWAYS 2
+
 #define SSHCTL_MASTER_NO        0
 #define SSHCTL_MASTER_YES       1
 #define SSHCTL_MASTER_AUTO      2
@@ -162,12 +182,12 @@ typedef struct {
 
 void     initialize_options(Options *);
 void     fill_default_options(Options *);
-int      read_config_file(const char *, const char *, Options *, int);
+int      process_config_line(Options *, struct passwd *, const char *, char *,
+    const char *, int, int *, int);
+int      read_config_file(const char *, struct passwd *, const char *,
+    Options *, int);
 int      parse_forward(Forward *, const char *, int, int);
-
-int
-process_config_line(Options *, const char *, char *, const char *, int, int *,
-    int);
+int      default_ssh_port(void);
 
 void     add_local_forward(Options *, const Forward *);
 void     add_remote_forward(Options *, const Forward *);