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

[Mike Link]

  User: mlink   
  Date: 11/08/31 23:43:02

  Modified:    server/src globus_i_gfs_config.c
  Log:
  control channel listing interface
  
  Revision  Changes    Path
  1.80      +2 -1      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.79&r2=1.80
  
  (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.79
  retrieving revision 1.80
  diff -u -b -r1.79 -r1.80
  --- globus_i_gfs_config.c	1 Sep 2011 02:12:07 -0000	1.79
  +++ globus_i_gfs_config.c	1 Sep 2011 04:43:01 -0000	1.80
  @@ -1823,7 +1823,7 @@
   
       val = globus_i_gfs_config_string(opt_name);
       
  -    if(val && *val != '/')
  +    if(val && *val != '/' && *val != '$')
       {
           base_path = globus_i_gfs_config_string("config_base_path");
           new_val = globus_common_create_string("%s/%s", base_path, val);
  @@ -1859,6 +1859,7 @@
       globus_l_gfs_config_adjust_path("log_transfer", 1);
       globus_l_gfs_config_adjust_path("banner_file", 1);
       globus_l_gfs_config_adjust_path("login_msg_file", 1);
  +    globus_l_gfs_config_adjust_path("pidfile", 1);
   
       if(globus_i_gfs_config_bool("detach") && 
           !globus_i_gfs_config_bool("daemon"))