From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Tue, 13 Mar 2012 09:25:59 +0000 (+0000)
Subject: Generate RFC proxy by default but support old-style proxy if explicitly requested
X-Git-Tag: glite-jobid-api-c_R_2_1_2_1~48
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=e1206185b48afc2d25ab187539a2a98dcd80f2e3;p=jra1mw.git

Generate RFC proxy by default but support old-style proxy if explicitly requested
---

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 e71d00e..f24b851 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
@@ -46,11 +46,13 @@ EndHelpHeader
         echo " -H | --hours           Proxy will be valid for given No. of hours (default is 12)"
         echo " -l | --lsc             Generate VOMS lsc file."
         echo " -V | --novoms          Skip VOMS stuff."
+	echo " -o | --old	      Create old-style non-RFC proxy."
 
 }
 
 GENLSC=0
 VOMS=1
+RFCSWITCH="-rfc"
 while test -n "$1"
 do
         case "$1" in
@@ -58,6 +60,7 @@ do
                 "-H" | "--hours") shift ; PROXYHOURS="-hours $1 " ;;
                 "-l" | "--lsc") GENLSC=1 ;;
                 "-V" | "--novoms") VOMS=0 ;;
+                "-o" | "--old") RFCSWITCH="" ;;
         esac
         shift
 done
@@ -88,7 +91,7 @@ for p in $USER $VOMS_SERVER $USER_BOB; do
 
 if [ $VOMS -eq 1 ]; then
 	for p in $USER $USER_BOB; do
-		voms-proxy-fake -cert ${p}.cert -key ${p}.priv-clear \
+		voms-proxy-fake -cert ${p}.cert -key ${p}.priv-clear $RFCSWITCH\
 			-hostcert ${VOMS_SERVER}.cert -hostkey ${VOMS_SERVER}.priv-clear $PROXYHOURS\
 			-voms ${VO} -out /tmp/x509up_u${p} \
 			-fqan "/${VO}/Role=NULL/Capability=NULL" &> /dev/null || exit 1