diff options
| author |  Thomas Guyot-Sionnest <dermoth@aei.ca>
| 2014-01-27 08:35:23 -0500 |
|---|---|---|
| committer | Thomas Guyot-Sionnest <dermoth@aei.ca>
| 2014-01-27 08:35:23 -0500 |
| commit | 189e2aa344b28a2cb5b5783450de201a9b2e3110 (patch) | |
| tree | d67c6b5a7e591dfd90d57d3ca7f660ac4d0fcfbe /lib | |
| parent | 4a10a9493acaf1f12da12ef4881e2abacec1373a (diff) | |
| download | monitoring-plugins-189e2aa344b28a2cb5b5783450de201a9b2e3110.tar.gz | |
Rename MP_STATE_DIRECTORY to MP_STATE_PATH
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tests/test_utils.c | 6 | ||||
| -rw-r--r-- | lib/utils_base.c | 4 |
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) 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 fdd7d23c..f5f75067 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 */ |