From 189e2aa344b28a2cb5b5783450de201a9b2e3110 Mon Sep 17 00:00:00 2001
From: Thomas Guyot-Sionnest <dermoth@aei.ca>
Date: Mon, 27 Jan 2014 08:35:23 -0500
Subject: Rename MP_STATE_DIRECTORY to MP_STATE_PATH


diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index 8c3ee22..0571340 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("MP_STATE_DIRECTORY");
+	unsetenv("MP_STATE_PATH");
 	temp_string = (char *) _np_state_calculate_location_prefix();
 	ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory" );
 
-	setenv("MP_STATE_DIRECTORY", "", 1);
+	setenv("MP_STATE_PATH", "", 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("MP_STATE_DIRECTORY", "/usr/local/nagios/var", 1);
+	setenv("MP_STATE_PATH", "/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 fdd7d23..f5f7506 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -417,10 +417,10 @@ void _cleanup_state_data() {
 char* _np_state_calculate_location_prefix(){
 	char *env_dir;
 
-	/* Do not allow passing MP_STATE_DIRECTORY in setuid plugins
+	/* Do not allow passing MP_STATE_PATH in setuid plugins
 	 * for security reasons */
 	if (mp_suid() == FALSE) {
-		env_dir = getenv("MP_STATE_DIRECTORY");
+		env_dir = getenv("MP_STATE_PATH");
 		if(env_dir && env_dir[0] != '\0')
 			return env_dir;
 		/* This is the former ENV, for backward-compatibility */
diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t
index 9a89607..dafc34f 100755
--- a/plugins/tests/check_snmp.t
+++ b/plugins/tests/check_snmp.t
@@ -59,7 +59,7 @@ if ($ARGV[0] && $ARGV[0] eq "-d") {
 }
 
 # We should merge that with $ENV{'NPTEST_CACHE'}, use one dir for all test data
-$ENV{'MP_STATE_DIRECTORY'} ||= "/var/tmp";
+$ENV{'MP_STATE_PATH'} ||= "/var/tmp";
 
 my $res;
 
@@ -109,7 +109,7 @@ like($res->output, '/'.quotemeta('SNMP OK - And now have fun with with this: \"C
 "And now have fun with with this: \"C:\\\\\"
 because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3");
 
-system("rm -f ".$ENV{'MP_STATE_DIRECTORY'}."/check_snmp/*");
+system("rm -f ".$ENV{'MP_STATE_PATH'}."/check_snmp/*");
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -w 600" );
 is($res->return_code, 0, "Returns OK");
 is($res->output, "No previous data to calculate rate - assume okay");
-- 
cgit v0.10-9-g596f