VO name has to be added to make a fake VOMS cert look like valid

diff --git a/bin/generate-test-certificates.sh b/bin/generate-test-certificates.sh
index 596a5d7..8ed79df 100755 (executable)
--- a/bin/generate-test-certificates.sh
+++ b/bin/generate-test-certificates.sh
@@ -286,14 +286,14 @@ function create_voms {
         return
     fi
 
-    # making sure VOMSDIR exists
+    # making sure X509_VOMS_DIR exists
     if [ ! -d 'grid-security/vomsdir' ]; then
         mkdir -p 'grid-security/vomsdir'
     fi
     if [ ! -f 'grid-security/vomsdir/hostcert.pem' ]; then
         cp grid-security/hostcert.pem grid-security/vomsdir/
     fi
-    export VOMSDIR='grid-security/vomsdir'
+    export X509_VOMS_DIR='grid-security/vomsdir'
 
     # using user credentials for both due to #17362
     # https://savannah.cern.ch/bugs/index.php?func=detailitem&item_id=17362
@@ -304,11 +304,13 @@ function create_voms {
     CMD="chmod 600 $userkey-nopwd"
     $CMD
 
+    vo=${1:1}
     CMD="voms-proxy-fake -pwstdin -hours 168 -newformat \
                     -cert $usercert -key $userkey-nopwd \
                     -certdir grid-security/certificates/ \
                     -hostcert $usercert -hostkey $userkey-nopwd \
-                    -out $filename "$(for fqan in $@; do echo -n "-fqan $fqan "; done)
+                    -out $filename -voms $vo \
+                    "$(for fqan in $@; do echo -n "-fqan $fqan "; done)
     echo $CMD
     $CMD
 
@@ -384,7 +386,6 @@ EOF
         create_voms home/voms-coyote.pem /org.coyote
         create_voms home/voms-coyote-Radmin.pem /org.coyote /org.coyote/Role=Admin
         create_voms home/voms-coyote-Gproduction.pem /org.coyote /org.coyote/production
-        create_voms home/voms-acme-coyote.pem /org.acme /org.coyote
 
         # and some basics for the extra certs
         if [ -n "$EXTRACERTS" ]; then
@@ -751,13 +752,13 @@ echo "export X509_CERT_DIR=$TARGETDIR/grid-security/certificates"
 echo "export X509_USER_CERT=$TARGETDIR/home/usercert.pem"
 echo "export X509_USER_KEY=$TARGETDIR/home/userkey.pem"
 if [ "$VOMS" = 'yes' ]; then
-    echo "export VOMSDIR=$TARGETDIR/grid-security/vomsdir"
+    echo "export X509_VOMS_DIR=$TARGETDIR/grid-security/vomsdir"
 fi
 
 cat >$TARGETDIR/home/env_settings.sh <<EOF
 export X509_CERT_DIR=$TARGETDIR/grid-security/certificates
 export X509_USER_CERT=$TARGETDIR/home/usercert.pem
 export X509_USER_KEY=$TARGETDIR/home/userkey.pem
-export VOMSDIR=$TARGETDIR/grid-security/vomsdir
+export X509_VOMS_DIR=$TARGETDIR/grid-security/vomsdir
 EOF