summaryrefslogtreecommitdiffstats
path: root/web/attachments/160015-check_ups--1.28.diff
diff options
context:
space:
mode:
Diffstat (limited to 'web/attachments/160015-check_ups--1.28.diff')
-rw-r--r--web/attachments/160015-check_ups--1.28.diff55
1 files changed, 55 insertions, 0 deletions
diff --git a/web/attachments/160015-check_ups--1.28.diff b/web/attachments/160015-check_ups--1.28.diff
new file mode 100644
index 0000000..b86f9bb
--- /dev/null
+++ b/web/attachments/160015-check_ups--1.28.diff
@@ -0,0 +1,55 @@
1--- check_ups.c.orig 2005-12-15 17:17:54.000000000 -0500
2+++ check_ups.c 2005-12-15 17:22:44.000000000 -0500
3@@ -7,6 +7,7 @@
4 Copyright (c) 2000 Tom Shields
5 2004 Alain Richard <alain.richard@equation.fr>
6 2004 Arnaud Quette <arnaud.quette@mgeups.com>
7+ 2005 Garrett Honeycutt <gh@3gupload.com>
8
9
10 This program is free software; you can redistribute it and/or modify
11@@ -23,13 +24,11 @@
12 along with this program; if not, write to the Free Software
13 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
14
15- $Id: check_ups.c,v 1.27 2005/03/04 21:58:40 tonvoon Exp $
16-
17 ******************************************************************************/
18
19 const char *progname = "check_ups";
20-const char *revision = "$Revision: 1.27 $";
21-const char *copyright = "2000-2004";
22+const char *revision = "$Revision: 1.28 $";
23+const char *copyright = "2000-2005";
24 const char *email = "nagiosplug-devel@lists.sourceforge.net";
25
26 #include "common.h"
27@@ -302,9 +301,17 @@
28 check_crit, (long)(1000*critical_value),
29 TRUE, 0, FALSE, 0));
30 } else {
31- asprintf (&data, "%s %s", data,
32- perfdata ("temp", (long)ups_temperature, "degF",
33- FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
34+ /* 2005 garrett honeycutt - small bugfix to print the correct abbreviation */
35+ if (temp_output_c) {
36+ asprintf (&data, "%s %s", data,
37+ perfdata ("temp", (long)ups_temperature, "degC",
38+ FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
39+ }
40+ else {
41+ asprintf (&data, "%s %s", data,
42+ perfdata ("temp", (long)ups_temperature, "degF",
43+ FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
44+ }
45 }
46 }
47
48@@ -588,6 +595,7 @@
49 printf ("Copyright (c) 2000 Tom Shields");
50 printf ("Copyright (c) 2004 Alain Richard <alain.richard@equation.fr>\n");
51 printf ("Copyright (c) 2004 Arnaud Quette <arnaud.quette@mgeups.com>\n");
52+ printf ("Copyright (c) 2005 Garrett Honeycutt <gh@3gupload.com>\n");
53 printf (COPYRIGHT, copyright, email);
54
55 printf (_("This plugin tests the UPS service on the specified host.\n\