[Nagios-checkins] SF.net SVN: nagios:[2754] nagioscore/branches/nagios-3-4-x

[<est...@us...>]

Revision: 2754
          http://nagios.svn.sourceforge.net/nagios/?rev=2754&view=rev
Author:   estanley375
Date:     2013-05-06 12:18:46 +0000 (Mon, 06 May 2013)
Log Message:
-----------
Fixed bug #407: Reloading nagios config causes spaces in notifications to become plus signs (Alexey Dvoryanchikov)

Also fixed bug #444: Nagios 3.5.0 problem with macro $ADMINEMAIL$ : @ is converted to %40 after 2 nagios reload (Duplicate of bug #407)

Modified Paths:
--------------
    nagioscore/branches/nagios-3-4-x/Changelog
    nagioscore/branches/nagios-3-4-x/common/macros.c

Modified: nagioscore/branches/nagios-3-4-x/Changelog
===================================================================
--- nagioscore/branches/nagios-3-4-x/Changelog	2013-05-06 00:40:40 UTC (rev 2753)
+++ nagioscore/branches/nagios-3-4-x/Changelog	2013-05-06 12:18:46 UTC (rev 2754)
@@ -4,6 +4,8 @@
 
 3.5.1 - xx/xx/xxxx
 ------------------
+* Fixed bug #444: Nagios 3.5.0 problem with macro $ADMINEMAIL$ : @ is converted to %40 after 2 nagios reload (Duplicate of bug #407)
+* Fixed bug #407: Reloading nagios config causes spaces in notifications to become plus signs (Alexey Dvoryanchikov)
 * Fixed bug #445: Adding triggered downtime for child hosts causes a SIGSEGV on restart/reload (Eric Stanley)
 * Fixed bug #375: Freshness expiration never reached and bug #427: freshness threshold doesn't work if it is set long (Scott Wilkerson, Eric Stanley)
 * Fixed bug #432: Downtime scheduled as "Nagios Process" and not the Users name (Sam Lansing, Eric Stanley)

Modified: nagioscore/branches/nagios-3-4-x/common/macros.c
===================================================================
--- nagioscore/branches/nagios-3-4-x/common/macros.c	2013-05-06 00:40:40 UTC (rev 2753)
+++ nagioscore/branches/nagios-3-4-x/common/macros.c	2013-05-06 12:18:46 UTC (rev 2754)
@@ -2585,6 +2585,7 @@
 	for(x = 0; x < MACRO_X_COUNT; x++) {
 		macro_keys[x].code = x;
 		macro_keys[x].name = macro_x_names[x];
+		macro_keys[x].clean_options = 0;
 
 		/* host/service output/perfdata and author/comment macros should get cleaned */
 		if((x >= 16 && x <= 19) || (x >= 49 && x <= 52) || (x >= 99 && x <= 100) || (x >= 124 && x <= 127)) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.