Author: glen Date: Sun May 21 21:34:50 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merge 1.4.3 from DEVEL
---- Files affected:
SOURCES:
nagios-plugins-check_ping-socket-filter-warning.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/nagios-plugins-check_ping-socket-filter-warning.patch
diff -u SOURCES/nagios-plugins-check_ping-socket-filter-warning.patch:1.2
SOURCES/nagios-plugins-check_ping-socket-filter-warning.patch:1.3
--- SOURCES/nagios-plugins-check_ping-socket-filter-warning.patch:1.2 Tue Mar
14 14:37:46 2006
+++ SOURCES/nagios-plugins-check_ping-socket-filter-warning.patch Sun May
21 23:34:45 2006
@@ -1,12 +1,15 @@
---- nagios-plugins-1.4.2/plugins/check_ping.c~ 2005-09-14 17:40:20.000000000
+0300
-+++ nagios-plugins-1.4.2/plugins/check_ping.c 2006-03-14 15:14:24.000000000
+0200
-@@ -453,7 +453,8 @@
-
+we don't want message from ping triggering a warning:
+WARNING: failed to install socket filter: Protocol not available
+
+--- nagios-plugins-1.4.3/plugins/check_ping.c~ 2006-05-21 23:02:33.988927080
+0300
++++ nagios-plugins-1.4.3/plugins/check_ping.c 2006-05-21 23:04:28.671500218
+0300
+@@ -454,7 +454,8 @@
/* check stderr, setting at least WARNING if there is output here */
- while (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr))
-- if (! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling
back to SIOCGSTAMP"))
+ /* Add warning into warn_text */
+ while (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr)) {
+- if (! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling
back to SIOCGSTAMP")) {
+ if (! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling
back to SIOCGSTAMP") &&
-+ ! strstr(buf,"WARNING: failed to install socket filter: Protocol
not available"))
- result = max_state (STATE_WARNING, error_scan (buf,
addr));
-
- (void) fclose (child_stderr);
++ ! strstr(buf,"WARNING: failed to install socket filter: Protocol
not available")) {
+ if (verbose >= 3) {
+ printf("Got stderr: %s", buf);
+ }
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/nagios-plugins-check_ping-socket-filter-warning.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
