Update default locations of blahp files.

Assume files are under /usr if no other guidance is given. Also, if the libexec directory has a 'blahp' subdirectory, assume the blahp's libexec files are there.
JaimeFrey · Jul 29, 2021 · f9a1795 · f9a1795
1 parent 7325234
commit f9a1795
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/src/blahpd.h b/src/blahpd.h
@@ -36,8 +36,8 @@
 
 #define RCSID_VERSION		"$GahpVersion: %s Mar 31 2008 INFN\\ blahpd\\ (%s) $"
 
-#define DEFAULT_GLITE_LOCATION "/opt/glite"
-#define DEFAULT_GLEXEC_COMMAND "/opt/glite/sbin/glexec"
+#define DEFAULT_GLITE_LOCATION "/usr"
+#define DEFAULT_GLEXEC_COMMAND "/usr/sbin/glexec"
 #define DEFAULT_SUDO_COMMAND "/usr/bin/sudo"
 
 /* Change this in order to select the default batch system

diff --git a/src/config.c b/src/config.c
@@ -125,6 +125,7 @@ config_read(const char *ipath)
   FILE *test;
   int file_cnt;
   struct dirent **file_list = NULL;
+  DIR *test_dir = NULL;
   char full_file[PATH_MAX];
   int i;
   struct passwd *pwd = NULL;
@@ -235,8 +236,21 @@ config_read(const char *ipath)
    }
   else
    {
-    rha->libexec_path = (char *)malloc(strlen(install_location)+9);
-    if (rha->libexec_path != NULL) sprintf(rha->libexec_path,"%s/libexec",install_location);
+    /* If libexec has a 'blahp' subdirectory, then the blahp files should
+     * be in there.
+     */
+    rha->libexec_path = (char *)malloc(strlen(install_location)+15);
+    if (rha->libexec_path != NULL)
+     {
+      sprintf(rha->libexec_path,"%s/libexec/blahp",install_location);
+      test_dir = opendir(rha->libexec_path);
+      if (test_dir == NULL)
+       {
+        sprintf(rha->libexec_path,"%s/libexec",install_location);
+       } else {
+        closedir(test_dir);
+       }
+     }
    }
   if (rha->libexec_path == NULL)
    {

diff --git a/src/scripts/blah_load_config.sh b/src/scripts/blah_load_config.sh
@@ -45,8 +45,13 @@ elif [ -d "${GLITE_LOCATION:-/opt/glite}/libexec" ]; then
 else
   blah_libexec_directory="/usr/libexec"
 fi
+# If the libexec directory has a 'blahp' subdirectory, then the blahp
+# files should be there.
+if [ -d "${blah_libexec_directory}/blahp" ]; then
+  blah_libexec_directory="${blah_libexec_directory}/blahp"
+fi
 
-# Let blah_bin_directory be overridden in the config file.
+# Let blah_{bin|sbin|libexec}_directory be overridden in the config file.
 
 config_file=/etc/blah.config
 if [ -r "$BLAHPD_CONFIG_LOCATION" ]; then