From: Greg Hudson <ghudson@mit.edu>
Date: Fri, 23 Oct 2015 19:20:33 +0000 (-0400)
Subject: Fix env-setup.shin after RUN_ENV simplification
X-Git-Tag: krb5-1.15-beta1~341
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e767d9fe054a9976d3d7ef25348688fc54995832;p=thirdparty%2Fkrb5.git

Fix env-setup.shin after RUN_ENV simplification

env-setup.shin converts @KRB5_RUN_ENV@ to a shell expression and evals
it.  Now that RUN_ENV no longer contains export statements, we need to
do that explicitly.
---

diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin
index dd2d8967e3..c8d866f153 100755
--- a/src/kadmin/testing/scripts/env-setup.shin
+++ b/src/kadmin/testing/scripts/env-setup.shin
@@ -33,6 +33,7 @@ EOF
 
 foo=`sed -e 's/(//g' -e 's/)//g' -e 's/\\\$\\\$/\$/g' /tmp/env_setup$$`
 eval $foo
+export @KRB5_RUN_VARS@
 
 # This will get put in setup.csh for convenience
 KRB5_RUN_ENV_CSH=`eval echo "$foo" | \