summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/tests/test_utils.c6
-rw-r--r--lib/utils_base.c4
-rwxr-xr-xplugins/tests/check_snmp.t4
3 files changed, 7 insertions, 7 deletions
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)
304 temp_string = (char *) _np_state_generate_key(); 304 temp_string = (char *) _np_state_generate_key();
305 ok(!strcmp(temp_string, "94b5e17bf5abf51cb15aff5f69b96f2f8dac5ecd"), "Got based on expected argv" ); 305 ok(!strcmp(temp_string, "94b5e17bf5abf51cb15aff5f69b96f2f8dac5ecd"), "Got based on expected argv" );
306 306
307 unsetenv("MP_STATE_DIRECTORY"); 307 unsetenv("MP_STATE_PATH");
308 temp_string = (char *) _np_state_calculate_location_prefix(); 308 temp_string = (char *) _np_state_calculate_location_prefix();
309 ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory" ); 309 ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory" );
310 310
311 setenv("MP_STATE_DIRECTORY", "", 1); 311 setenv("MP_STATE_PATH", "", 1);
312 temp_string = (char *) _np_state_calculate_location_prefix(); 312 temp_string = (char *) _np_state_calculate_location_prefix();
313 ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory even with empty string" ); 313 ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory even with empty string" );
314 314
315 setenv("MP_STATE_DIRECTORY", "/usr/local/nagios/var", 1); 315 setenv("MP_STATE_PATH", "/usr/local/nagios/var", 1);
316 temp_string = (char *) _np_state_calculate_location_prefix(); 316 temp_string = (char *) _np_state_calculate_location_prefix();
317 ok(!strcmp(temp_string, "/usr/local/nagios/var"), "Got default directory" ); 317 ok(!strcmp(temp_string, "/usr/local/nagios/var"), "Got default directory" );
318 318
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() {
417char* _np_state_calculate_location_prefix(){ 417char* _np_state_calculate_location_prefix(){
418 char *env_dir; 418 char *env_dir;
419 419
420 /* Do not allow passing MP_STATE_DIRECTORY in setuid plugins 420 /* Do not allow passing MP_STATE_PATH in setuid plugins
421 * for security reasons */ 421 * for security reasons */
422 if (mp_suid() == FALSE) { 422 if (mp_suid() == FALSE) {
423 env_dir = getenv("MP_STATE_DIRECTORY"); 423 env_dir = getenv("MP_STATE_PATH");
424 if(env_dir && env_dir[0] != '\0') 424 if(env_dir && env_dir[0] != '\0')
425 return env_dir; 425 return env_dir;
426 /* This is the former ENV, for backward-compatibility */ 426 /* 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") {
59} 59}
60 60
61# We should merge that with $ENV{'NPTEST_CACHE'}, use one dir for all test data 61# We should merge that with $ENV{'NPTEST_CACHE'}, use one dir for all test data
62$ENV{'MP_STATE_DIRECTORY'} ||= "/var/tmp"; 62$ENV{'MP_STATE_PATH'} ||= "/var/tmp";
63 63
64my $res; 64my $res;
65 65
@@ -109,7 +109,7 @@ like($res->output, '/'.quotemeta('SNMP OK - And now have fun with with this: \"C
109"And now have fun with with this: \"C:\\\\\" 109"And now have fun with with this: \"C:\\\\\"
110because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3"); 110because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3");
111 111
112system("rm -f ".$ENV{'MP_STATE_DIRECTORY'}."/check_snmp/*"); 112system("rm -f ".$ENV{'MP_STATE_PATH'}."/check_snmp/*");
113$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" ); 113$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" );
114is($res->return_code, 0, "Returns OK"); 114is($res->return_code, 0, "Returns OK");
115is($res->output, "No previous data to calculate rate - assume okay"); 115is($res->output, "No previous data to calculate rate - assume okay");