X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=snmp%2Flustre-snmp-trap.c;h=0080b90fcf488c12f0bdcf3b7ad47f5b6369e3c8;hb=98015004516cad1173e2bac2a4695bdc56e4d9a4;hp=c908d4712f8a3d5991de135831fc76d156892ed7;hpb=59a59cc9d33f94fb857129b255ad42f393d7242e;p=fs%2Flustre-release.git

diff --git a/snmp/lustre-snmp-trap.c b/snmp/lustre-snmp-trap.c
index c908d47..0080b90 100644
--- a/snmp/lustre-snmp-trap.c
+++ b/snmp/lustre-snmp-trap.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -232,16 +228,23 @@ void health_poll_worker(unsigned int registration_number, void *clientarg)
     FILE    *fptr = NULL;
     char string[MAX_LINE_SIZE];
     int b_seen_portals_catastrophe = 0;
-    const char *filename =  g_health_check_test_file == 0 ? 
-            LUSTRE_PATH FILENAME_SYSHEALTHCHECK : 
-            g_health_check_test_file;
-    
+    char *filename;
+    glob_t path;
+
+    if (cfs_get_param_paths(&path, "health_check") != 0)
+        return;
+
+    filename = g_health_check_test_file == 0 ? path.gl_pathv[0] : g_health_check_test_file;
+
     /*DEBUGMSGTL(("lsnmpd","health_entry_parser(%s)\n",filename));*/
 
     /* Open the file.  Use the test file env variable if
        there is one */    
     fptr = fopen(filename,"r");
         
+    /* Free parameter's path string */
+    cfs_free_param_data(&path);
+
     /* If the path is not found do nothing */
     if( NULL == fptr)
         return;