2 files changed, 9 insertions, 3 deletions

diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index 7a1a1fa1..12252f48 100644
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
@@ -304,15 +304,15 @@ main (int argc, char **argv)
         temp_string = (char *) _np_state_generate_key();
         ok(!strcmp(temp_string, "94b5e17bf5abf51cb15aff5f69b96f2f8dac5ecd"), "Got based on expected argv" );
 
-        unsetenv("NAGIOS_PLUGIN_STATE_DIRECTORY");
+        unsetenv("MP_STATE_DIRECTORY");
         temp_string = (char *) _np_state_calculate_location_prefix();
         ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory" );
 
-        setenv("NAGIOS_PLUGIN_STATE_DIRECTORY", "", 1);
+        setenv("MP_STATE_DIRECTORY", "", 1);
         temp_string = (char *) _np_state_calculate_location_prefix();
         ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory even with empty string" );
 
-        setenv("NAGIOS_PLUGIN_STATE_DIRECTORY", "/usr/local/nagios/var", 1);
+        setenv("MP_STATE_DIRECTORY", "/usr/local/nagios/var", 1);
         temp_string = (char *) _np_state_calculate_location_prefix();
         ok(!strcmp(temp_string, "/usr/local/nagios/var"), "Got default directory" );
 
diff --git a/lib/utils_base.c b/lib/utils_base.c
index 57d01e27..304b732b 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -415,9 +415,15 @@ void _cleanup_state_data() {
 char* _np_state_calculate_location_prefix(){
         char *env_dir;
 
+        /* FIXME: Undocumented */
+        env_dir = getenv("MP_STATE_DIRECTORY");
+        if(env_dir && env_dir[0] != '\0')
+                return env_dir;
+        /* This is the former ENV, for backward-compatibility */
         env_dir = getenv("NAGIOS_PLUGIN_STATE_DIRECTORY");
         if(env_dir && env_dir[0] != '\0')
                 return env_dir;
+
         return NP_STATE_DIR_PREFIX;
 }