summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl DeBisschop <kdebisschop@users.sourceforge.net>2002-10-20 18:49:00 +0000
committerKarl DeBisschop <kdebisschop@users.sourceforge.net>2002-10-20 18:49:00 +0000
commita396d2177806ac4ee9f524a139b19ad29c76ca91 (patch)
tree94c636ee1e7d6193ba278be87b8177bc0e097905
parent93ac4565479ce8b32d5a99aec174323ef73bd12f (diff)
downloadmonitoring-plugins-a396d2177806ac4ee9f524a139b19ad29c76ca91.tar.gz
change ssprintf to asprintf
back out change at line 225 in r1.4 (values were mismatched to format string, so output was nonsense) (I left a comment showing a construct that should work, but it fails for PHBs: if my disk gets nearly full, they want 'CRITICAL - 99%' not 'CRITICAL - Gauge32: 99') (If someine has a rationale for the change, maybe it could be done as an option? - it seems fairly clear that the Web display should be sensible to PHBs so long as there's no real loss) git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@143 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--plugins/check_snmp.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index eae52ca8..220be234 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -144,8 +144,8 @@ main (int argc, char **argv)
144 usage ("Incorrect arguments supplied\n"); 144 usage ("Incorrect arguments supplied\n");
145 145
146 /* create the command line to execute */ 146 /* create the command line to execute */
147 command_line = ssprintf 147 asprintf
148 (command_line, 148 (&command_line,
149 "%s -p %s -m ALL -v 1 %s -c %s %s", 149 "%s -p %s -m ALL -v 1 %s -c %s %s",
150 PATH_TO_SNMPGET, port, server_address, community, oid); 150 PATH_TO_SNMPGET, port, server_address, community, oid);
151 151
@@ -221,8 +221,8 @@ main (int argc, char **argv)
221 p2 = strpbrk (p2, "0123456789"); 221 p2 = strpbrk (p2, "0123456789");
222 response_value[i] = strtoul (p2, NULL, 10); 222 response_value[i] = strtoul (p2, NULL, 10);
223 iresult = check_num (i); 223 iresult = check_num (i);
224 /*For consistency- full SNMP response every time */ 224 asprintf (&show, "%lu", response_value[i]);
225 show = ssprintf (show, "%d", response); 225 /*asprintf (&show, "%s", response); */
226 } 226 }
227 227
228 else if (eval_method[i] & CRIT_STRING) { 228 else if (eval_method[i] & CRIT_STRING) {
@@ -264,21 +264,18 @@ main (int argc, char **argv)
264 result = max_state (result, iresult); 264 result = max_state (result, iresult);
265 265
266 if (nlabels > 1 && i < nlabels && labels[i] != NULL) 266 if (nlabels > 1 && i < nlabels && labels[i] != NULL)
267 outbuff = ssprintf 267 asprintf
268 (outbuff, 268 (&outbuff,
269 "%s%s%s %s%s%s", 269 "%s%s%s %s%s%s",
270 outbuff, 270 outbuff,
271 (i == 0) ? " " : output_delim, 271 (i == 0) ? " " : output_delim,
272 labels[i], mark (iresult), show, mark (iresult)); 272 labels[i], mark (iresult), show, mark (iresult));
273 else 273 else
274 outbuff = ssprintf 274 asprintf (&outbuff, "%s%s%s%s%s", outbuff,
275 (outbuff,
276 "%s%s%s%s%s",
277 outbuff,
278 (i == 0) ? " " : output_delim, mark (iresult), show, mark (iresult)); 275 (i == 0) ? " " : output_delim, mark (iresult), show, mark (iresult));
279 276
280 if (nunits > 0 && i < nunits) 277 if (nunits > 0 && i < nunits)
281 outbuff = ssprintf (outbuff, "%s %s", outbuff, unitv[i]); 278 asprintf (&outbuff, "%s %s", outbuff, unitv[i]);
282 279
283 i++; 280 i++;
284 281