[gridftp-commit] CVS update: MODIFIED: src ...

[Mike Link]

  User: mlink   
  Date: 08/03/06 17:17:24

  Modified:    server/src Tag: globus_4_0_branch globus_i_gfs_config.c
  Log:
  Fix invalid configfile options getting silently ignored.
  
  Revision  Changes    Path
  No                   revision
  
  http://viewcvs.globus.org/viewcvs.cgi/gridftp/server/src/Tag:
  No                   revision
  
  http://viewcvs.globus.org/viewcvs.cgi/gridftp/server/src/globus_4_0_branch
  1.30.4.9  +14 -2     gridftp/server/src/globus_i_gfs_config.c
  
  http://viewcvs.globus.org/viewcvs.cgi/gridftp/server/src/globus_i_gfs_config.c.diff?r1=1.30.4.8&r2=1.30.4.9
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: globus_i_gfs_config.c
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/gridftp/server/src/globus_i_gfs_config.c,v
  retrieving revision 1.30.4.8
  retrieving revision 1.30.4.9
  diff -u -b -r1.30.4.8 -r1.30.4.9
  --- globus_i_gfs_config.c	29 Nov 2007 21:47:41 -0000	1.30.4.8
  +++ globus_i_gfs_config.c	6 Mar 2008 23:17:23 -0000	1.30.4.9
  @@ -357,6 +357,7 @@
       int                                 optlen;
       char *                              p;
       globus_off_t                        tmp_off;
  +    globus_bool_t                       found;
       GlobusGFSName(globus_l_gfs_config_load_config_file);
       GlobusGFSDebugEnter();
   
  @@ -431,6 +432,7 @@
               goto error_parse;
           }
   
  +        found = GLOBUS_FALSE;
           for(i = 0; i < option_count; i++)
           {
               if(option_list[i].option_name == NULL)
  @@ -443,6 +445,8 @@
                   continue;
               }
               
  +            found = GLOBUS_TRUE;
  +            
               option = (globus_l_gfs_config_option_t *) globus_hashtable_remove(
                       &option_table, option_list[i].option_name);   
               if(!option)
  @@ -481,6 +485,13 @@
                   /* XXX error, log something */
               }
           }
  +        if(!found)
  +        {
  +            fprintf(stderr, "Problem parsing config file %s: line %d. "
  +                "Unknown option '%s'.\n", 
  +                filename, line_num, file_option);
  +            goto error_param;
  +        }
       }
   
       fclose(fptr);
  @@ -490,8 +501,9 @@
   
   error_parse:
       fclose(fptr);
  -    fprintf(stderr, "Problem parsing config file %s: line %d\n", 
  +    fprintf(stderr, "Problem parsing config file %s: line %d.\n", 
           filename, line_num);
  +error_param:
       GlobusGFSDebugExitWithError();
       return -1;