[PATCH] Re-definition of env-time

[Andrew Stribblehill]

I found that after upgrading to 2.0.5, I came across the following
error message:

Reserved variable $(env_time) in use

Turns out that $(env_time) gets defined in the Update context and
doesn't get undefined afterwards. When I patched this (moved
DeleteMacros outside the if statement from cfagent.c:109 to 115) I
got a complaint from GetEnvironment:

Unable to detect the environment from cfenvd.

I tracked this down to cfagent.c:553 which sets 'env' instead of
'value'. ('env' is treated as the filename of the environment
settings.) So, it only used to work coincidentally -- precisely
because it was able to give the error message, and thus didn't
re-define 'env'.

This patch (attached) fixes it.
-- 
SOUTH UTSIRE
NORTHWESTERLY VEERING SOUTHEASTERLY 4 OR 5. FAIR. MAINLY GOOD

0_cfagent_01_env_time
Description: Text document