- 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@

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 @@
-/* $OpenBSD: readconf.h,v 1.100 2014/01/29 06:18:35 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.101 2014/02/23 20:11:36 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -176,12 +176,14 @@ typedef struct {
 
 void     initialize_options(Options *);
 void     fill_default_options(Options *);
+void     fill_default_options_for_canonicalization(Options *);
 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      default_ssh_port(void);
+int      option_clear_or_none(const char *);
 
 void     add_local_forward(Options *, const Forward *);
 void     add_remote_forward(Options *, const Forward *);