[BACK]Return to ssh.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh.c between version 1.495 and 1.496

version 1.495, 2018/10/23 05:56:35 version 1.496, 2018/11/23 05:08:07
Line 511 
Line 511 
  * file if the user specifies a config file on the command line.   * file if the user specifies a config file on the command line.
  */   */
 static void  static void
 process_config_files(const char *host_name, struct passwd *pw, int post_canon)  process_config_files(const char *host_name, struct passwd *pw, int final_pass,
       int *want_final_pass)
 {  {
         char buf[PATH_MAX];          char buf[PATH_MAX];
         int r;          int r;
Line 519 
Line 520 
         if (config != NULL) {          if (config != NULL) {
                 if (strcasecmp(config, "none") != 0 &&                  if (strcasecmp(config, "none") != 0 &&
                     !read_config_file(config, pw, host, host_name, &options,                      !read_config_file(config, pw, host, host_name, &options,
                     SSHCONF_USERCONF | (post_canon ? SSHCONF_POSTCANON : 0)))                      SSHCONF_USERCONF | (final_pass ? SSHCONF_FINAL : 0),
                       want_final_pass))
                         fatal("Can't open user config file %.100s: "                          fatal("Can't open user config file %.100s: "
                             "%.100s", config, strerror(errno));                              "%.100s", config, strerror(errno));
         } else {          } else {
Line 528 
Line 530 
                 if (r > 0 && (size_t)r < sizeof(buf))                  if (r > 0 && (size_t)r < sizeof(buf))
                         (void)read_config_file(buf, pw, host, host_name,                          (void)read_config_file(buf, pw, host, host_name,
                             &options, SSHCONF_CHECKPERM | SSHCONF_USERCONF |                              &options, SSHCONF_CHECKPERM | SSHCONF_USERCONF |
                             (post_canon ? SSHCONF_POSTCANON : 0));                              (final_pass ? SSHCONF_FINAL : 0), want_final_pass);
   
                 /* Read systemwide configuration file after user config. */                  /* Read systemwide configuration file after user config. */
                 (void)read_config_file(_PATH_HOST_CONFIG_FILE, pw,                  (void)read_config_file(_PATH_HOST_CONFIG_FILE, pw,
                     host, host_name, &options,                      host, host_name, &options,
                     post_canon ? SSHCONF_POSTCANON : 0);                      final_pass ? SSHCONF_FINAL : 0, want_final_pass);
         }          }
 }  }
   
Line 565 
Line 567 
 {  {
         struct ssh *ssh = NULL;          struct ssh *ssh = NULL;
         int i, r, opt, exit_status, use_syslog, direct, timeout_ms;          int i, r, opt, exit_status, use_syslog, direct, timeout_ms;
         int was_addr, config_test = 0, opt_terminated = 0;          int was_addr, config_test = 0, opt_terminated = 0, want_final_pass = 0;
         char *p, *cp, *line, *argv0, buf[PATH_MAX], *logfile;          char *p, *cp, *line, *argv0, buf[PATH_MAX], *logfile;
         char cname[NI_MAXHOST];          char cname[NI_MAXHOST];
         struct stat st;          struct stat st;
Line 1068 
Line 1070 
                 );                  );
   
         /* Parse the configuration files */          /* Parse the configuration files */
         process_config_files(host_arg, pw, 0);          process_config_files(host_arg, pw, 0, &want_final_pass);
           if (want_final_pass)
                   debug("configuration requests final Match pass");
   
         /* Hostname canonicalisation needs a few options filled. */          /* Hostname canonicalisation needs a few options filled. */
         fill_default_options_for_canonicalization(&options);          fill_default_options_for_canonicalization(&options);
Line 1125 
Line 1129 
          * If canonicalisation is enabled then re-parse the configuration           * If canonicalisation is enabled then re-parse the configuration
          * files as new stanzas may match.           * files as new stanzas may match.
          */           */
         if (options.canonicalize_hostname != 0) {          if (options.canonicalize_hostname != 0 && !want_final_pass) {
                 debug("Re-reading configuration after hostname "                  debug("hostname canonicalisation enabled, "
                     "canonicalisation");                      "will re-parse configuration");
                   want_final_pass = 1;
           }
   
           if (want_final_pass) {
                   debug("re-parsing configuration");
                 free(options.hostname);                  free(options.hostname);
                 options.hostname = xstrdup(host);                  options.hostname = xstrdup(host);
                 process_config_files(host_arg, pw, 1);                  process_config_files(host_arg, pw, 1, NULL);
                 /*                  /*
                  * Address resolution happens early with canonicalisation                   * Address resolution happens early with canonicalisation
                  * enabled and the port number may have changed since, so                   * enabled and the port number may have changed since, so
Legend:
Removed from v.1.495  
changed lines
  Added in v.1.496