2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 0fbe54738..7d2877682 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20000315
  - Fix broken CFLAGS handling during search for OpenSSL. Fixes va_list
    problems with gcc/Solaris.
+ - Don't free argument to putenv() after use (in setenv() replacement). 
+   Report from Seigo Tanimura <tanimura@r.dl.itc.u-tokyo.ac.jp>
 
 20000314
  - Include macro for IN6_IS_ADDR_V4MAPPED. Report from 
diff --git a/bsd-misc.c b/bsd-misc.c
index 99fe29816..83cb0b85d 100644
--- a/bsd-misc.c
+++ b/bsd-misc.c
@@ -154,7 +154,10 @@ int setenv(const char *name, const char *value, int overwrite)
         
         result = putenv(env_string);
         
-        xfree(env_string);
+        /* Putenv doesn't copy the env_string, so we need to keep a copy of it */
+        /* around. This leaks a bit of memory, but it doesn't matter */
+        /* for our (OpenSSH port ) use: setenv is only used twice in ssh-agent */
+/*      xfree(env_string); */
         
         return(result); 
 }