From 05ab1c4f51bf919a20a6d7a0238eba60064518cd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Fri, 24 Feb 2012 11:54:24 +0000 Subject: [PATCH] Make sure lscs are generated only for regular files. --- .../gridsite/tests/gridsite-test-all.sh | 26 ++++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) 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 9ca94c9..23676cd 100755 --- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh +++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh @@ -393,18 +393,20 @@ EOF for vomsfile in /etc/vomses/* do - VOMSHOSTONLY=`cat $vomsfile | awk '{ print $2 }' | sed 's/"//g'` - VOMSHOST=`cat $vomsfile | awk '{ print $2 ":" $3; }' | sed 's/"//g'` - VONAME=`cat $vomsfile | awk '{ print $1 }' | sed 's/"//g'` - openssl s_client -connect $VOMSHOST 2>&1 | grep "^depth" | sed 's/^depth=//' | sort -r -n > $VOMSHOSTONLY.$$.DNs.txt - VOMSCERT=`tail -n 1 $VOMSHOSTONLY.$$.DNs.txt | sed -r 's/^[0-9]+\s+//'` - VOMSCA=`grep -E "^1[ \t]" $VOMSHOSTONLY.$$.DNs.txt | sed -r 's/^[0-9]+\s+//'` - - mkdir -p /etc/grid-security/vomsdir/$VONAME - printf "$VOMSCERT\n$VOMSCA\n" > /etc/grid-security/vomsdir/$VONAME/$VOMSHOSTONLY.lsc - echo Generated /etc/grid-security/vomsdir/$VONAME/$VOMSHOSTONLY.lsc - - rm $VOMSHOSTONLY.$$.DNs.txt + if [ -f $vomsfile ]; then + VOMSHOSTONLY=`cat $vomsfile | awk '{ print $2 }' | sed 's/"//g'` + VOMSHOST=`cat $vomsfile | awk '{ print $2 ":" $3; }' | sed 's/"//g'` + VONAME=`cat $vomsfile | awk '{ print $1 }' | sed 's/"//g'` + openssl s_client -connect $VOMSHOST 2>&1 | grep "^depth" | sed 's/^depth=//' | sort -r -n > $VOMSHOSTONLY.$$.DNs.txt + VOMSCERT=`tail -n 1 $VOMSHOSTONLY.$$.DNs.txt | sed -r 's/^[0-9]+\s+//'` + VOMSCA=`grep -E "^1[ \t]" $VOMSHOSTONLY.$$.DNs.txt | sed -r 's/^[0-9]+\s+//'` + + mkdir -p /etc/grid-security/vomsdir/$VONAME + printf "$VOMSCERT\n$VOMSCA\n" > /etc/grid-security/vomsdir/$VONAME/$VOMSHOSTONLY.lsc + echo Generated /etc/grid-security/vomsdir/$VONAME/$VOMSHOSTONLY.lsc + + rm $VOMSHOSTONLY.$$.DNs.txt + fi done GRST_CRED_2=`curl --cert /tmp/x509up_u0 --key /tmp/x509up_u0 --capath /etc/grid-security/certificates --silent https://$(hostname -f)/test.cgi|grep GRST_CRED_2` -- 1.8.2.3