From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Wed, 26 Oct 2011 11:57:03 +0000 (+0000)
Subject: Avoid stepping into another user's work
X-Git-Tag: glite-px-myproxy-yaim_R_4_1_5_1~19
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=88f2a7ea15800ffc1665612a087526cb9bb01f07;p=jra1mw.git

Avoid stepping into another user's work
---

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh b/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh
index 19c095e..723744a 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh
@@ -65,8 +65,8 @@ if [ $COPYPROXY -eq 1 ]; then
 else
 	rm -rf /tmp/test-certs/grid-security
 	cvs -d :pserver:anonymous@glite.cvs.cern.ch:/cvs/jra1mw co org.glite.testsuites.ctb/LB
-	./org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh
-	cp -rv /tmp/test-certs/grid-security/certificates/* /etc/grid-security/certificates/
+	FAKE_CAS=\`./org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh | grep -E "^X509_CERT_DIR" | sed 's/X509_CERT_DIR=//'\`
+	cp -rv $FAKE_CAS/* /etc/grid-security/certificates/
 fi
 
 CVSPATH=\`which cvs\`
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh b/org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh
index 91b4a81..151faaf 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh
@@ -18,7 +18,7 @@
 
 # show help and usage
 progname=`basename $0`
-CERTS_ROOT=/tmp/test-certs
+CERTS_ROOT=/tmp/test-certs.$$
 USER=trusted_client00
 USER_BOB=trusted_client01
 VOMS_SERVER=trusted_host
@@ -57,8 +57,8 @@ done
 echo "Generating fake proxy certificate - this may take a few minutes"
 echo ""
 
-cd /tmp
-rm -rf $CERTS_ROOT org.glite.security.test-utils
+mkdir -p $CERTS_ROOT
+cd $CERTS_ROOT
 wget -q -O org.glite.security.test-utils.tar.gz \
   'http://jra1mw.cvs.cern.ch:8180/cgi-bin/jra1mw.cgi/org.glite.security.test-utils.tar.gz?view=tar' &> /dev/null || exit 1
 tar xzf org.glite.security.test-utils.tar.gz || exit 1