[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.385 and 1.386

version 1.385, 2013/10/16 02:31:46 version 1.386, 2013/10/16 22:49:39
Line 262 
Line 262 
         if (*cname == '\0' || options.num_permitted_cnames == 0 ||          if (*cname == '\0' || options.num_permitted_cnames == 0 ||
             strcmp(*namep, cname) == 0)              strcmp(*namep, cname) == 0)
                 return 0;                  return 0;
         if (options.canonicalise_hostname == SSH_CANONICALISE_NO)          if (options.canonicalize_hostname == SSH_CANONICALISE_NO)
                 return 0;                  return 0;
         /*          /*
          * Don't attempt to canonicalise names that will be interpreted by           * Don't attempt to canonicalize names that will be interpreted by
          * a proxy unless the user specifically requests so.           * a proxy unless the user specifically requests so.
          */           */
         if (options.proxy_command != NULL &&          if (options.proxy_command != NULL &&
             options.canonicalise_hostname != SSH_CANONICALISE_ALWAYS)              options.canonicalize_hostname != SSH_CANONICALISE_ALWAYS)
                 return 0;                  return 0;
         debug3("%s: check \"%s\" CNAME \"%s\"", __func__, *namep, cname);          debug3("%s: check \"%s\" CNAME \"%s\"", __func__, *namep, cname);
         for (i = 0; i < options.num_permitted_cnames; i++) {          for (i = 0; i < options.num_permitted_cnames; i++) {
Line 279 
Line 279 
                     match_pattern_list(cname, rule->target_list,                      match_pattern_list(cname, rule->target_list,
                     strlen(rule->target_list), 1) != 1)                      strlen(rule->target_list), 1) != 1)
                         continue;                          continue;
                 verbose("Canonicalised DNS aliased hostname "                  verbose("Canonicalized DNS aliased hostname "
                     "\"%s\" => \"%s\"", *namep, cname);                      "\"%s\" => \"%s\"", *namep, cname);
                 free(*namep);                  free(*namep);
                 *namep = xstrdup(cname);                  *namep = xstrdup(cname);
Line 294 
Line 294 
  * if no name was found after canonicalisation.   * if no name was found after canonicalisation.
  */   */
 static struct addrinfo *  static struct addrinfo *
 resolve_canonicalise(char **hostp, u_int port)  resolve_canonicalize(char **hostp, u_int port)
 {  {
         int i, ndots;          int i, ndots;
         char *cp, *fullhost, cname_target[NI_MAXHOST];          char *cp, *fullhost, cname_target[NI_MAXHOST];
         struct addrinfo *addrs;          struct addrinfo *addrs;
   
         if (options.canonicalise_hostname == SSH_CANONICALISE_NO)          if (options.canonicalize_hostname == SSH_CANONICALISE_NO)
                 return NULL;                  return NULL;
         /*          /*
          * Don't attempt to canonicalise names that will be interpreted by           * Don't attempt to canonicalize names that will be interpreted by
          * a proxy unless the user specifically requests so.           * a proxy unless the user specifically requests so.
          */           */
         if (options.proxy_command != NULL &&          if (options.proxy_command != NULL &&
             options.canonicalise_hostname != SSH_CANONICALISE_ALWAYS)              options.canonicalize_hostname != SSH_CANONICALISE_ALWAYS)
                 return NULL;                  return NULL;
         /* Don't apply canonicalisation to sufficiently-qualified hostnames */          /* Don't apply canonicalisation to sufficiently-qualified hostnames */
         ndots = 0;          ndots = 0;
Line 315 
Line 315 
                 if (*cp == '.')                  if (*cp == '.')
                         ndots++;                          ndots++;
         }          }
         if (ndots > options.canonicalise_max_dots) {          if (ndots > options.canonicalize_max_dots) {
                 debug3("%s: not canonicalising hostname \"%s\" (max dots %d)",                  debug3("%s: not canonicalizing hostname \"%s\" (max dots %d)",
                     __func__, *hostp, options.canonicalise_max_dots);                      __func__, *hostp, options.canonicalize_max_dots);
                 return NULL;                  return NULL;
         }          }
         /* Attempt each supplied suffix */          /* Attempt each supplied suffix */
Line 334 
Line 334 
                 fullhost[strlen(fullhost) - 1] = '\0';                  fullhost[strlen(fullhost) - 1] = '\0';
                 /* Follow CNAME if requested */                  /* Follow CNAME if requested */
                 if (!check_follow_cname(&fullhost, cname_target)) {                  if (!check_follow_cname(&fullhost, cname_target)) {
                         debug("Canonicalised hostname \"%s\" => \"%s\"",                          debug("Canonicalized hostname \"%s\" => \"%s\"",
                             *hostp, fullhost);                              *hostp, fullhost);
                 }                  }
                 free(*hostp);                  free(*hostp);
                 *hostp = fullhost;                  *hostp = fullhost;
                 return addrs;                  return addrs;
         }          }
         if (!options.canonicalise_fallback_local)          if (!options.canonicalize_fallback_local)
                 fatal("%s: Could not resolve host \"%s\"", __progname, host);                  fatal("%s: Could not resolve host \"%s\"", __progname, host);
         return NULL;          return NULL;
 }  }
Line 873 
Line 873 
         }          }
   
         /* If canonicalisation requested then try to apply it */          /* If canonicalisation requested then try to apply it */
         if (options.canonicalise_hostname != SSH_CANONICALISE_NO)          if (options.canonicalize_hostname != SSH_CANONICALISE_NO)
                 addrs = resolve_canonicalise(&host, options.port);                  addrs = resolve_canonicalize(&host, options.port);
         /*          /*
          * If canonicalisation not requested, or if it failed then try to           * If canonicalisation not requested, or if it failed then try to
          * resolve the bare hostname name using the system resolver's usual           * resolve the bare hostname name using the system resolver's usual
Legend:
Removed from v.1.385  
changed lines
  Added in v.1.386