From bbeef9b96aae7ddb245cbeb23c15dc99a8516311 Mon Sep 17 00:00:00 2001 From: Marcel Poul Date: Thu, 19 Apr 2012 15:26:31 +0000 Subject: [PATCH] use hostname -f before hostname -A (beware of hostname -A has space character after the FQDN) --- org.glite.testsuites.ctb/CANL-C/tests/canl-test-cs-openssl.sh | 2 +- org.glite.testsuites.ctb/CANL-C/tests/canl-test-sec-connection.sh | 2 +- org.glite.testsuites.ctb/CANL-C/tests/canl-test-sha2.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.glite.testsuites.ctb/CANL-C/tests/canl-test-cs-openssl.sh b/org.glite.testsuites.ctb/CANL-C/tests/canl-test-cs-openssl.sh index 1361430..3488e6b 100755 --- a/org.glite.testsuites.ctb/CANL-C/tests/canl-test-cs-openssl.sh +++ b/org.glite.testsuites.ctb/CANL-C/tests/canl-test-cs-openssl.sh @@ -59,7 +59,7 @@ source ${COMMON} #flag=0 srvbin="" clibin="" -server_host=`hostname -A 2> /dev/null || hostname -f 2> /dev/null` +server_host=`hostname -f 2> /dev/null || hostname -A 2> /dev/null` while test -n "$1" do case "$1" in diff --git a/org.glite.testsuites.ctb/CANL-C/tests/canl-test-sec-connection.sh b/org.glite.testsuites.ctb/CANL-C/tests/canl-test-sec-connection.sh index 92ebde7..1b9f6be 100755 --- a/org.glite.testsuites.ctb/CANL-C/tests/canl-test-sec-connection.sh +++ b/org.glite.testsuites.ctb/CANL-C/tests/canl-test-sec-connection.sh @@ -58,7 +58,7 @@ source ${COMMON} #flag=0 srvbin="" clibin="" -server_host=`hostname -A 2> /dev/null || hostname -f 2> /dev/null` +server_host=`hostname -f 2> /dev/null || hostname -A 2> /dev/null` while test -n "$1" do case "$1" in diff --git a/org.glite.testsuites.ctb/CANL-C/tests/canl-test-sha2.sh b/org.glite.testsuites.ctb/CANL-C/tests/canl-test-sha2.sh index 0bce473..ed97570 100755 --- a/org.glite.testsuites.ctb/CANL-C/tests/canl-test-sha2.sh +++ b/org.glite.testsuites.ctb/CANL-C/tests/canl-test-sha2.sh @@ -170,7 +170,7 @@ else exit 2 fi -server_host=`hostname -A 2> /dev/null || hostname -f 2> /dev/null` +server_host=`hostname -f 2> /dev/null || hostname -A 2> /dev/null` ${EMI_CANL_CLIENT} -s "${server_host}" -p "${nu_port}" -k "${sha2_key}"\ -c "${sha2_cert}" if [ $? -ne 0 ]; then -- 1.8.2.3