summaryrefslogtreecommitdiff
path: root/readconf.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-02-24 15:57:55 +1100
committerDamien Miller <djm@mindrot.org>2014-02-24 15:57:55 +1100
commit13f97b2286142fd0b8eab94e4ce84fe124eeb752 (patch)
treeb332b16a032b4670b60db1261b6dac48e059d916 /readconf.h
parentbee3a234f3d1ad4244952bcff1b4b7c525330dc2 (diff)
- djm@cvs.openbsd.org 2014/02/23 20:11:36
[readconf.c readconf.h ssh.c ssh_config.5] reparse ssh_config and ~/.ssh/config if hostname canonicalisation changes the hostname. This allows users to write configurations that always refer to canonical hostnames, e.g. CanonicalizeHostname yes CanonicalDomains int.example.org example.org CanonicalizeFallbackLocal no Host *.int.example.org Compression off Host *.example.org User djm ok markus@
Diffstat (limited to 'readconf.h')
-rw-r--r--readconf.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h
index 9723da078..75e3f8f7a 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.h,v 1.100 2014/01/29 06:18:35 djm Exp $ */ 1/* $OpenBSD: readconf.h,v 1.101 2014/02/23 20:11:36 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -176,12 +176,14 @@ typedef struct {
176 176
177void initialize_options(Options *); 177void initialize_options(Options *);
178void fill_default_options(Options *); 178void fill_default_options(Options *);
179void fill_default_options_for_canonicalization(Options *);
179int process_config_line(Options *, struct passwd *, const char *, char *, 180int process_config_line(Options *, struct passwd *, const char *, char *,
180 const char *, int, int *, int); 181 const char *, int, int *, int);
181int read_config_file(const char *, struct passwd *, const char *, 182int read_config_file(const char *, struct passwd *, const char *,
182 Options *, int); 183 Options *, int);
183int parse_forward(Forward *, const char *, int, int); 184int parse_forward(Forward *, const char *, int, int);
184int default_ssh_port(void); 185int default_ssh_port(void);
186int option_clear_or_none(const char *);
185 187
186void add_local_forward(Options *, const Forward *); 188void add_local_forward(Options *, const Forward *);
187void add_remote_forward(Options *, const Forward *); 189void add_remote_forward(Options *, const Forward *);