summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2014-06-18 00:39:38 +0200
committerHolger Weiss <holger@zedat.fu-berlin.de>2014-06-18 00:39:38 +0200
commitf94e95785cb15a0028be40019848ec05a8e208a8 (patch)
treed0c7c36acd5a81fe9bd7b68f1fa883284dfbe395
parentf02b3f6b2866e2ccb8cdfc2257c1f9a540ddc3e9 (diff)
downloadmonitoring-plugins-f94e957.tar.gz
lib/parse_ini.c: Read "monitoring-plugins.ini"
Read "monitoring-plugins.ini" if that file exists, but fall back to reading "plugins.ini" or "nagios-plugins.ini" for backward compatibility.
-rw-r--r--lib/parse_ini.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index b6d80562..e19af1bb 100644
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
@@ -41,12 +41,16 @@ typedef struct {
41} np_ini_info; 41} np_ini_info;
42 42
43static char *default_ini_file_names[] = { 43static char *default_ini_file_names[] = {
44 "monitoring-plugins.ini",
44 "plugins.ini", 45 "plugins.ini",
45 "nagios-plugins.ini", 46 "nagios-plugins.ini",
46 NULL 47 NULL
47}; 48};
48 49
49static char *default_ini_path_names[] = { 50static char *default_ini_path_names[] = {
51 "/usr/local/etc/monitoring-plugins.ini",
52 "/etc/monitoring-plugins.ini",
53 /* Deprecated path names (for backward compatibility): */
50 "/etc/nagios/plugins.ini", 54 "/etc/nagios/plugins.ini",
51 "/usr/local/nagios/etc/plugins.ini", 55 "/usr/local/nagios/etc/plugins.ini",
52 "/usr/local/etc/nagios/plugins.ini", 56 "/usr/local/etc/nagios/plugins.ini",