Fixes for macros introduced in latest CVS update

[Andreas Ericsson]

Ahoy.

I've been playing around with the nagios code a bit and found a two bugs 
inserted while making the latest additions to the macro family;
HOSTACTIONURL, HOSTNOTESURL, SERVICEACTIONURL and SERVICENOTESURL.

1. Originally, Nagios would free and NULL the extended data after 
parsing it and dumping it to the objects.cache file. As such, the 
extended info macros couldn't be expanded at notification time and thus 
failed. This has been fixed in the attached patch.

2. It is allowed to use a limited subset of macros in these variables, 
namely HOSTADDRESS, HOSTNAME and (for services only) SERVICEDESC.
Previously, these macros were expanded at run-time by the CGI programs 
which turned out to be troublesome come notification time. I relocated 
the code so that URL macro expansion takes place at loading time and 
made the necessary changes to the CGI's.
As a bonus, a few of the cgi's will run a little faster as well.


I have done a few test so far and everything appears to be in order. Let 
me know if you find any bugs.

-- 
Andreas Ericsson                   andreas.ericsson at op5.se
OP5 AB                             www.op5.se
Lead Developer
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: nagios-extinfo_url-processing.diff
URL: <https://www.monitoring-lists.org/archive/developers/attachments/20041023/b4e99942/attachment.ksh>