2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 04b200dca..1add8ad8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20000102
+ - Prevent multiple inclusion of config.h and defines.h. Suggested
+   by Andre Lucas <andre.lucas@dial.pipex.com>
+ - Properly clean up on exit of ssh-agent. Patch from Dean Gaudet
+   <dgaudet@arctic.org>
+
 19991231
  - Fix password support on systems with a mixture of shadowed and 
    non-shadowed passwords (e.g. NIS). Report and fix from 
@@ -17,8 +23,6 @@
 
  - Added support for directory-based lastlogs
  - Really fix typedefs, patch from Ben Taylor <bent@clark.net>
- - Prevent multiple inclusion of config.h and defines.h. Suggested
-   by Andre Lucas <andre.lucas@dial.pipex.com>
 
 19991230
  - OpenBSD CVS updates:
diff --git a/ssh-agent.c b/ssh-agent.c
index d224386c8..27ab6eaa9 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -643,6 +643,8 @@ main(int ac, char **av)
                 signal(SIGALRM, check_parent_exists);
                 alarm(10);
         }
+        signal(SIGHUP, cleanup_exit);
+        signal(SIGTERM, cleanup_exit);
         signal(SIGINT, SIG_IGN);
         signal(SIGPIPE, SIG_IGN);
         while (1) {