[Mon-commit] mon mon,1.21,1.22

[David N. <vi...@us...>]

Update of /cvsroot/mon/mon
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16088

Modified Files:
	mon 
Log Message:
Fixed a bug where unknown traps could never get mapped to
default:default, only to default:XYZ, where XYZ is the service 
in the trap.


Index: mon
===================================================================
RCS file: /cvsroot/mon/mon/mon,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** mon	12 Dec 2005 19:44:58 -0000	1.21
--- mon	13 Jul 2006 12:03:39 -0000	1.22
***************
*** 4338,4353 ****
  	if (!defined $watch{$trap{"grp"}} && defined $watch{"default"})
  	{
  	    $trap{"grp"} = "default";
  	}
  
! 	if ((!defined ($groups{$trap{"grp"}}) &&
! 		!defined $watch{$trap{"grp"}}->{$trap{"svc"}}) &&
! 		(defined($groups{'default'}) &&
! 		defined($watch{'default'}->{'default'})))
  	{
- 	    $intended = "$trap{'grp'}:$trap{'svc'}";
- 	    $trap{"grp"} = "default";
  	    $trap{"svc"} = "default";
  	}
  	if (!defined ($groups{$trap{"grp"}}))
  	{
--- 4338,4352 ----
  	if (!defined $watch{$trap{"grp"}} && defined $watch{"default"})
  	{
+ 	    $intended = "$trap{'grp'}:$trap{'svc'}";
  	    $trap{"grp"} = "default";
  	}
  
! 	if ($trap{"grp"} eq 'default'
! 	    && !defined($watch{default}->{$trap{"svc"}})
! 	    && defined($watch{'default'}->{'default'}))
  	{
  	    $trap{"svc"} = "default";
  	}
+ 
  	if (!defined ($groups{$trap{"grp"}}))
  	{