SOURCES: munin-node-config.patch - munin-run also barfed on non-ex...

[baggins]

Author: baggins                      Date: Sun Oct  9 19:16:49 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- munin-run also barfed on non-existant user/group

---- Files affected:
SOURCES:
   munin-node-config.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/munin-node-config.patch
diff -u SOURCES/munin-node-config.patch:1.1 SOURCES/munin-node-config.patch:1.2
--- SOURCES/munin-node-config.patch:1.1	Sun Oct  9 14:40:40 2005
+++ SOURCES/munin-node-config.patch	Sun Oct  9 21:16:43 2005
@@ -18,3 +18,23 @@
  		}
  		elsif (!defined $g and $optional)
  		{
+--- munin-1.3.2/node/munin-run.in~	2005-04-15 22:31:21.000000000 +0200
++++ munin-1.3.2/node/munin-run.in	2005-10-09 21:12:20.575416064 +0200
+@@ -457,7 +457,7 @@
+ 	    if (!defined $sconf->{$service}{'user'})
+ 	    {
+ 		warn "User \"$tmpid\" in configuration file \"$dir/$file\" nonexistant. Skipping plugin.";
+-		return undef;
++		next;
+ 	    }
+ 	}
+ 	elsif (/^\s*group\s+(.+)\s*$/)
+@@ -477,7 +477,7 @@
+ 		if (!defined $g and !$optional)
+ 		{
+ 		    warn "Group \"$group\" in configuration file \"$dir/$file\" nonexistant. Skipping plugin.";
+-		    return undef;
++		    next;
+ 		}
+ 		elsif (!defined $g and $optional)
+ 		{
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/munin-node-config.patch?r1=1.1&r2=1.2&f=u