Fixes #14. Renames the config file and changes the default LoginName.

JasonAlt · Jun 29, 2018 · 6a9e67d · 6a9e67d
1 parent ebae668
commit 6a9e67d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,6 @@
 Version 2.5 (PRE): Wed Jun 27 11:48:59 CDT 2018
+	- issue 14: the DSI config file was renamed to gridftp_hpss_dsi.conf
+	            the default LoginName in gridftp_hpss_dsi.conf is now 'hpssftp'
 	- issue 15: Error on STOR: "Premature end of data transfer"
 	- issue 16: Error on STOR: "Handle not in proper state EOF."
 

diff --git a/ConfigFile → gridftp_hpss_dsi.conf b/ConfigFile → gridftp_hpss_dsi.conf
@@ -4,7 +4,7 @@
 
 # (required) Name of the HPSS user in the keytab file that the GridFTP
 # server will use to authenticate to HPSS
-LoginName gridftp
+LoginName hpssftp
 
 # (required) AuthenticationMech
 # Defines the type of authentication that the DSI will perform when logging 

diff --git a/source/module/config.c b/source/module/config.c
@@ -63,8 +63,8 @@
 /*
  * The config file search order is:
  *   1) env HPSS_DSI_CONFIG_FILE=<path>
- *   2) $HPSS_PATH_ETC/gridftp.conf
- *   3) DEFAULT_CONFIG_FILE (/var/hpss/etc/gridftp.conf)
+ *   2) $HPSS_PATH_ETC/gridftp_hpss_dsi.conf
+ *   3) DEFAULT_CONFIG_FILE (/var/hpss/etc/gridftp_hpss_dsi.conf)
  */
 globus_result_t
 config_find_config_file(char ** ConfigFilePath)
@@ -101,7 +101,7 @@ config_find_config_file(char ** ConfigFilePath)
 	if (hpss_path_etc != NULL)
 	{
 		/* Construct the full path. */
-		*ConfigFilePath = globus_common_create_string("%s/gridftp.conf", hpss_path_etc);
+		*ConfigFilePath = globus_common_create_string("%s/gridftp_hpss_dsi.conf", hpss_path_etc);
 		if (!*ConfigFilePath)
 		{
 			result = GlobusGFSErrorMemory("config file path");

diff --git a/source/module/config.h b/source/module/config.h
@@ -46,7 +46,7 @@
  */
 #include <globus_gridftp_server.h>
 
-#define DEFAULT_CONFIG_FILE   "/var/hpss/etc/gridftp.conf"
+#define DEFAULT_CONFIG_FILE   "/var/hpss/etc/gridftp_hpss_dsi.conf"
 
 typedef struct config {
 	char * LoginName;