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

Diff for /src/usr.bin/ssh/readconf.c between version 1.251 and 1.252

version 1.251, 2016/04/06 06:42:17 version 1.252, 2016/04/15 00:30:19
Line 24 
Line 24 
 #include <ctype.h>  #include <ctype.h>
 #include <errno.h>  #include <errno.h>
 #include <fcntl.h>  #include <fcntl.h>
   #include <glob.h>
 #include <netdb.h>  #include <netdb.h>
 #include <paths.h>  #include <paths.h>
 #include <pwd.h>  #include <pwd.h>
Line 114 
Line 115 
   
 */  */
   
   static int read_config_file_depth(const char *filename, struct passwd *pw,
       const char *host, const char *original_host, Options *options,
       int flags, int *activep, int depth);
   static int process_config_line_depth(Options *options, struct passwd *pw,
       const char *host, const char *original_host, char *line,
       const char *filename, int linenum, int *activep, int flags, int depth);
   
 /* Keyword tokens. */  /* Keyword tokens. */
   
 typedef enum {  typedef enum {
         oBadOption,          oBadOption,
         oHost, oMatch,          oHost, oMatch, oInclude,
         oForwardAgent, oForwardX11, oForwardX11Trusted, oForwardX11Timeout,          oForwardAgent, oForwardX11, oForwardX11Trusted, oForwardX11Timeout,
         oGatewayPorts, oExitOnForwardFailure,          oGatewayPorts, oExitOnForwardFailure,
         oPasswordAuthentication, oRSAAuthentication,          oPasswordAuthentication, oRSAAuthentication,
Line 247 
Line 255 
         { "controlmaster", oControlMaster },          { "controlmaster", oControlMaster },
         { "controlpersist", oControlPersist },          { "controlpersist", oControlPersist },
         { "hashknownhosts", oHashKnownHosts },          { "hashknownhosts", oHashKnownHosts },
           { "include", oInclude },
         { "tunnel", oTunnel },          { "tunnel", oTunnel },
         { "tunneldevice", oTunnelDevice },          { "tunneldevice", oTunnelDevice },
         { "localcommand", oLocalCommand },          { "localcommand", oLocalCommand },
Line 772 
Line 781 
  * Processes a single option line as used in the configuration files. This   * Processes a single option line as used in the configuration files. This
  * only sets those values that have not already been set.   * only sets those values that have not already been set.
  */   */
 #define WHITESPACE " \t\r\n"  
 int  int
 process_config_line(Options *options, struct passwd *pw, const char *host,  process_config_line(Options *options, struct passwd *pw, const char *host,
     const char *original_host, char *line, const char *filename,      const char *original_host, char *line, const char *filename,
     int linenum, int *activep, int flags)      int linenum, int *activep, int flags)
 {  {
           return process_config_line_depth(options, pw, host, original_host,
               line, filename, linenum, activep, flags, 0);
   }
   
   #define WHITESPACE " \t\r\n"
   static int
   process_config_line_depth(Options *options, struct passwd *pw, const char *host,
       const char *original_host, char *line, const char *filename,
       int linenum, int *activep, int flags, int depth)
   {
         char *s, **charptr, *endofnumber, *keyword, *arg, *arg2;          char *s, **charptr, *endofnumber, *keyword, *arg, *arg2;
         char **cpptr, fwdarg[256];          char **cpptr, fwdarg[256];
         u_int i, *uintptr, max_entries = 0;          u_int i, *uintptr, max_entries = 0;
         int negated, opcode, *intptr, value, value2, cmdline = 0;          int r, oactive, negated, opcode, *intptr, value, value2, cmdline = 0;
         LogLevel *log_level_ptr;          LogLevel *log_level_ptr;
         long long val64;          long long val64;
         size_t len;          size_t len;
         struct Forward fwd;          struct Forward fwd;
         const struct multistate *multistate_ptr;          const struct multistate *multistate_ptr;
         struct allowed_cname *cname;          struct allowed_cname *cname;
           glob_t gl;
   
         if (activep == NULL) { /* We are processing a command line directive */          if (activep == NULL) { /* We are processing a command line directive */
                 cmdline = 1;                  cmdline = 1;
Line 1247 
Line 1266 
                 *activep = 0;                  *activep = 0;
                 arg2 = NULL;                  arg2 = NULL;
                 while ((arg = strdelim(&s)) != NULL && *arg != '\0') {                  while ((arg = strdelim(&s)) != NULL && *arg != '\0') {
                           if ((flags & SSHCONF_NEVERMATCH) != 0)
                                   break;
                         negated = *arg == '!';                          negated = *arg == '!';
                         if (negated)                          if (negated)
                                 arg++;                                  arg++;
Line 1279 
Line 1300 
                 if (value < 0)                  if (value < 0)
                         fatal("%.200s line %d: Bad Match condition", filename,                          fatal("%.200s line %d: Bad Match condition", filename,
                             linenum);                              linenum);
                 *activep = value;                  *activep = (flags & SSHCONF_NEVERMATCH) ? 0 : value;
                 break;                  break;
   
         case oEscapeChar:          case oEscapeChar:
Line 1407 
Line 1428 
                 intptr = &options->visual_host_key;                  intptr = &options->visual_host_key;
                 goto parse_flag;                  goto parse_flag;
   
           case oInclude:
                   if (cmdline)
                           fatal("Include directive not supported as a "
                               "command-line option");
                   value = 0;
                   while ((arg = strdelim(&s)) != NULL && *arg != '\0') {
                           /*
                            * Ensure all paths are anchored. User configuration
                            * files may begin with '~/' but system configurations
                            * must not. If the path is relative, then treat it
                            * as living in ~/.ssh for user configurations or
                            * /etc/ssh for system ones.
                            */
                           if (*arg == '~' && (flags & SSHCONF_USERCONF) == 0)
                                   fatal("%.200s line %d: bad include path %s.",
                                       filename, linenum, arg);
                           if (*arg != '/' && *arg != '~') {
                                   xasprintf(&arg2, "%s/%s",
                                       (flags & SSHCONF_USERCONF) ?
                                       "~/" _PATH_SSH_USER_DIR : SSHDIR, arg);
                           } else
                                   arg2 = xstrdup(arg);
                           memset(&gl, 0, sizeof(gl));
                           r = glob(arg2, GLOB_TILDE, NULL, &gl);
                           if (r == GLOB_NOMATCH) {
                                   debug("%.200s line %d: include %s matched no "
                                       "files",filename, linenum, arg2);
                                   continue;
                           } else if (r != 0 || gl.gl_pathc < 0)
                                   fatal("%.200s line %d: glob failed for %s.",
                                       filename, linenum, arg2);
                           free(arg2);
                           oactive = *activep;
                           for (i = 0; i < (u_int)gl.gl_pathc; i++) {
                                   debug3("%.200s line %d: Including file %s "
                                       "depth %d%s", filename, linenum,
                                       gl.gl_pathv[i], depth,
                                       oactive ? "" : " (parse only)");
                                   r = read_config_file_depth(gl.gl_pathv[i],
                                       pw, host, original_host, options,
                                       flags | SSHCONF_CHECKPERM |
                                       (oactive ? 0 : SSHCONF_NEVERMATCH),
                                       activep, depth + 1);
                                   /*
                                    * don't let Match in includes clobber the
                                    * containing file's Match state.
                                    */
                                   *activep = oactive;
                                   if (r != 1)
                                           value = -1;
                           }
                           globfree(&gl);
                   }
                   if (value != 0)
                           return value;
                   break;
   
         case oIPQoS:          case oIPQoS:
                 arg = strdelim(&s);                  arg = strdelim(&s);
                 if ((value = parse_ipqos(arg)) == -1)                  if ((value = parse_ipqos(arg)) == -1)
Line 1565 
Line 1643 
         return 0;          return 0;
 }  }
   
   
 /*  /*
  * Reads the config file and modifies the options accordingly.  Options   * Reads the config file and modifies the options accordingly.  Options
  * should already be initialized before this call.  This never returns if   * should already be initialized before this call.  This never returns if
  * there is an error.  If the file does not exist, this returns 0.   * there is an error.  If the file does not exist, this returns 0.
  */   */
   
 int  int
 read_config_file(const char *filename, struct passwd *pw, const char *host,  read_config_file(const char *filename, struct passwd *pw, const char *host,
     const char *original_host, Options *options, int flags)      const char *original_host, Options *options, int flags)
 {  {
           int active = 1;
   
           return read_config_file_depth(filename, pw, host, original_host,
               options, flags, &active, 0);
   }
   
   #define READCONF_MAX_DEPTH      16
   static int
   read_config_file_depth(const char *filename, struct passwd *pw,
       const char *host, const char *original_host, Options *options,
       int flags, int *activep, int depth)
   {
         FILE *f;          FILE *f;
         char line[1024];          char line[1024];
         int active, linenum;          int linenum;
         int bad_options = 0;          int bad_options = 0;
   
           if (depth < 0 || depth > READCONF_MAX_DEPTH)
                   fatal("Too many recursive configuration includes");
   
         if ((f = fopen(filename, "r")) == NULL)          if ((f = fopen(filename, "r")) == NULL)
                 return 0;                  return 0;
   
Line 1600 
Line 1691 
          * Mark that we are now processing the options.  This flag is turned           * Mark that we are now processing the options.  This flag is turned
          * on/off by Host specifications.           * on/off by Host specifications.
          */           */
         active = 1;  
         linenum = 0;          linenum = 0;
         while (fgets(line, sizeof(line), f)) {          while (fgets(line, sizeof(line), f)) {
                 /* Update line number counter. */                  /* Update line number counter. */
                 linenum++;                  linenum++;
                 if (process_config_line(options, pw, host, original_host,                  if (process_config_line_depth(options, pw, host, original_host,
                     line, filename, linenum, &active, flags) != 0)                      line, filename, linenum, activep, flags, depth) != 0)
                         bad_options++;                          bad_options++;
         }          }
         fclose(f);          fclose(f);
Legend:
Removed from v.1.251  
changed lines
  Added in v.1.252