summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@aei.ca>2014-01-27 08:35:23 -0500
committerThomas Guyot-Sionnest <dermoth@aei.ca>2014-01-27 08:35:23 -0500
commit189e2aa344b28a2cb5b5783450de201a9b2e3110 (patch)
treed67c6b5a7e591dfd90d57d3ca7f660ac4d0fcfbe /lib
parent4a10a9493acaf1f12da12ef4881e2abacec1373a (diff)
downloadmonitoring-plugins-189e2aa344b28a2cb5b5783450de201a9b2e3110.tar.gz
Rename MP_STATE_DIRECTORY to MP_STATE_PATH
Diffstat (limited to 'lib')
-rw-r--r--lib/tests/test_utils.c6
-rw-r--r--lib/utils_base.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index 8c3ee229..0571340b 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 fdd7d23c..f5f75067 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 */