From: jbasney <jbasney>
Date: Thu, 6 Jun 2002 19:40:42 +0000 (+0000)
Subject: remove duplicate call to copy_environment(), probably added by a merge error
X-Git-Tag: OPENSSH_3_2_3P1_GSI_2~31
X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/commitdiff_plain/4420bef56518c6a4283a81407bf643686d78b511

remove duplicate call to copy_environment(), probably added by a merge error
---

diff --git a/openssh/session.c b/openssh/session.c
index 290d91c..0818d94 100644
--- a/openssh/session.c
+++ b/openssh/session.c
@@ -876,7 +876,6 @@ do_setup_env(Session *s, const char *shell)
 	 * the childs environment as they see fit
 	 */
 	ssh_gssapi_do_child(&env,&envsize);
-	copy_environment(environ, &env, &envsize);
 #endif
 
 	if (!options.use_login) {