+++ /dev/null
---- plugins/check_swap.c.orig 2003-02-18 05:46:15.000000000 +0200
-+++ plugins/check_swap.c 2004-08-23 17:08:21.328421472 +0300
-@@ -70,30 +70,37 @@
-
- #ifdef HAVE_PROC_MEMINFO
- fp = fopen (PROC_MEMINFO, "r");
-+ if (!fp) {
-+ printf ("Could not open meminfo proc file\n");
-+ return STATE_UNKNOWN;
-+ }
- asprintf (&status, "%s", "Swap used:");
- while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
-- if (sscanf (input_buffer, " %s %lu %lu %lu", str, &total, &used, &free) == 4 &&
-- strstr (str, "Swap")) {
-- total_swap += total;
-- used_swap += used;
-+ if (sscanf (input_buffer, "%s %lu", str, &total) == 2 &&
-+ strstr (str, "SwapTotal:")) {
-+ total *= 1024;
-+ total_swap += total;
-+ used_swap += total_swap;
-+ } else
-+ if (sscanf (input_buffer, "%s %lu", str, &free) == 2 &&
-+ strstr (str, "SwapFree:")) {
-+ free *= 1024;
- free_swap += free;
-- if (allswaps) {
-- percent = 100 * (((double) used) / ((double) total));
-- if (percent >= crit_percent || free <= crit_size)
-- result = max_state (STATE_CRITICAL, result);
-- else if (percent >= warn_percent || free <= warn_size)
-- result = max_state (STATE_WARNING, result);
-- if (verbose)
-- asprintf (&status, "%s [%lu/%lu]", status, used, total);
-- }
-+ used_swap -= free_swap;
- }
- }
-- percent_used = 100 * (((double) used_swap) / ((double) total_swap));
-- if (percent_used >= crit_percent || free_swap <= crit_size)
-+
-+ if (total_swap == 0) {
-+ percent_used = 100;
- result = max_state (STATE_CRITICAL, result);
-- else if (percent_used >= warn_percent || free_swap <= warn_size)
-- result = max_state (STATE_WARNING, result);
-- asprintf (&status, "%s %2d%% (%lu out of %lu)", status, percent_used,
-+ } else {
-+ percent_used = 100 * (0.005 + ((double) used_swap) / ((double) total_swap));
-+ if (percent_used >= crit_percent || free_swap <= crit_size)
-+ result = max_state (STATE_CRITICAL, result);
-+ else if (percent_used >= warn_percent || free_swap <= warn_size)
-+ result = max_state (STATE_WARNING, result);
-+ }
-+ asprintf (&status, "%s %2d%% (%lu out of %lu)", status, percent_used,
- used_swap, total_swap);
- fclose (fp);
- #else
+++ /dev/null
---- configure.in~ 2004-12-08 12:18:03.000000000 +0200
-+++ configure.in 2004-12-08 12:24:07.000000000 +0200
-@@ -915,7 +915,8 @@
- fi
-
- AC_PATH_PROG(PATH_TO_FPING,fping)
--if test -x "$PATH_TO_FPING"
-+# we ignore execute test check, as by default we don't have access to it
-+if test -f "$PATH_TO_FPING"
- then
- AC_DEFINE_UNQUOTED(PATH_TO_FPING,"$PATH_TO_FPING",[path to fping])
- EXTRAS="$EXTRAS check_fping"
+++ /dev/null
---- ./plugins-root/Makefile.am~ 2005-10-19 15:59:55.000000000 +0300
-+++ ./plugins-root/Makefile.am 2005-11-05 03:52:30.000000000 +0200
-@@ -40,10 +40,6 @@
- p=$$f; \
- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
-- echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \
-- chown root $(DESTDIR)$(libexecdir)/$$p; \
-- echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \
-- chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
- done
-
- install-root: $(EXTRA_PROGRAMS)