sync

diff --git a/CHANGES b/CHANGES
index 60d62b9ec0d41cb184d989d0d9a214f2023ef497..1f746adc914c2e7bee21d7ac79ec56d2219e243c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1734,11 +1734,17 @@ Sudo 1.6.8 released.
 
 Sudo 1.6.8p1 released.
 
-549) New trace functionality for systems with systrace(4).  When tracing
+549) New monitor functionality for systems with systrace(4).  When tracing
      is enabled sudo will fork a daemon that traces the command and
      intercepts and execve() calls and allows/denies the call based on
-     a sudoers lookup.
+     a sudoers lookup.  Also updates the command's environment with
+     the SUDO_* variables if supported by the version of systrace(4).
 
 550) Added support for multiple sudoers file via #include.
 
 551) An empty sudoers file is no longer a parse error.
+
+552) Fixed error handling if the lexer runs out of memory.
+
+553) Optimize lexer slightly by removing use of unput() and remove
+     some ambiguity with the Default keyword.