From: Marcel Poul <marcel.poul@cern.ch>
Date: Sun, 11 Nov 2012 10:45:09 +0000 (+0000)
Subject: use proper CApath in proxy delegation
X-Git-Tag: emi-canl-c_R_2_0_2_1~7
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=4b091e429e9fa47b8f902584225a198ce23c5a75;p=jra1mw.git

use proper CApath in proxy delegation
---

diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh
index ce608fc..2cb508e 100755
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh
@@ -365,7 +365,7 @@ EOF
 	chown $HTTPD_USER /var/www/proxycache
 
 	#delegation
-	id=`htproxyput --cert ${UPROXY} --key ${UPROXY} --capath ${UPROXY} https://$(hostname -f)/gridsite-delegation.cgi`
+	id=`htproxyput --cert ${UPROXY} --key ${UPROXY} --capath /etc/grid-security/certificates https://$(hostname -f)/gridsite-delegation.cgi`
 	printf "id: $id"
 	if [ $? -eq 0 -a -n "$id" ]; then 
 		test_done
@@ -373,9 +373,9 @@ EOF
 		test_failed
 	fi
 
-	expiry=`htproxyunixtime --cert ${UPROXY} --key ${UPROXY} --capath ${UPROXY} --delegation-id $id https://$(hostname -f)/gridsite-delegation.cgi`
+	expiry=`htproxyunixtime --cert ${UPROXY} --key ${UPROXY} --capath etc/grid-security/certificates --delegation-id $id https://$(hostname -f)/gridsite-delegation.cgi`
 
-	newid=`htproxyrenew --cert ${UPROXY} --key ${UPROXY} --capath ${UPROXY} --delegation-id $id https://$(hostname -f)/gridsite-delegation.cgi`
+	newid=`htproxyrenew --cert ${UPROXY} --key ${UPROXY} --capath etc/grid-security/certificates --delegation-id $id https://$(hostname -f)/gridsite-delegation.cgi`
 	printf "newid: $newid"
 	if [ $? -eq 0 -a -n "$newid" ]; then 
 		test_done
@@ -383,7 +383,7 @@ EOF
 		test_failed
 	fi
 
-	htproxydestroy --cert ${UPROXY} --key ${UPROXY} --capath ${UPROXY} --delegation-id $id https://$(hostname -f)/gridsite-delegation.cgi
+	htproxydestroy --cert ${UPROXY} --key ${UPROXY} --capath etc/grid-security/certificates --delegation-id $id https://$(hostname -f)/gridsite-delegation.cgi
 
 
 	printf "Test handling of VOMS .lsc files (Regression test for bug #39254 and #82023)\n"