From 4c5a2bbd770cac12f4854cbe0e4bf471daa711b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=E1=B4=8F=C9=B4=C9=A2=20Jie?= Date: Fri, 6 Jul 2018 15:22:59 +0800 Subject: [PATCH] Fix github issue #5365. Thinker for the openssl s_client -no_ssl2 command line argument (#5376) --- xCAT/postscripts/getcredentials.awk | 2 +- xCAT/postscripts/getpostscript.awk | 2 +- xCAT/postscripts/startsyncfiles.awk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT/postscripts/getcredentials.awk b/xCAT/postscripts/getcredentials.awk index 8e42c1da2..61bc91324 100755 --- a/xCAT/postscripts/getcredentials.awk +++ b/xCAT/postscripts/getcredentials.awk @@ -2,7 +2,7 @@ BEGIN { if ((ENVIRON["USEOPENSSLFORXCAT"]) || (ENVIRON["AIX"])) { server = "openssl s_client -quiet -no_ssl3 -connect " ENVIRON["XCATSERVER"] " -rand /bin/nice 2> /dev/null" - if (system("openssl s_client -help 2>&1 | grep -m 1 -q -- -no_ssl2")) { + if (!system("openssl s_client -help 2>&1 | grep -m 1 -q -- -no_ssl2")) { server = "openssl s_client -quiet -no_ssl3 -no_ssl2 -connect " ENVIRON["XCATSERVER"] " -rand /bin/nice 2> /dev/null" } } else { diff --git a/xCAT/postscripts/getpostscript.awk b/xCAT/postscripts/getpostscript.awk index 4afde78ec..985b34dcb 100755 --- a/xCAT/postscripts/getpostscript.awk +++ b/xCAT/postscripts/getpostscript.awk @@ -2,7 +2,7 @@ BEGIN { if (ENVIRON["USEOPENSSLFORXCAT"]) { server = "openssl s_client -no_ssl3 -connect " ENVIRON["XCATSERVER"] " -rand /bin/nice 2> /dev/null" - if (system("openssl s_client -help 2>&1 | grep -m 1 -q -- -no_ssl2")) { + if (!system("openssl s_client -help 2>&1 | grep -m 1 -q -- -no_ssl2")) { server = "openssl s_client -no_ssl3 -no_ssl2 -connect " ENVIRON["XCATSERVER"] " -rand /bin/nice 2> /dev/null" } } else { diff --git a/xCAT/postscripts/startsyncfiles.awk b/xCAT/postscripts/startsyncfiles.awk index f146f5d03..3219f1c53 100755 --- a/xCAT/postscripts/startsyncfiles.awk +++ b/xCAT/postscripts/startsyncfiles.awk @@ -2,7 +2,7 @@ BEGIN { if (ENVIRON["USEOPENSSLFORXCAT"]) { server = "openssl s_client -no_ssl3 -connect " ENVIRON["XCATSERVER"] " -rand /bin/nice 2> /dev/null" - if (system("openssl s_client -help 2>&1 | grep -m 1 -q -- -no_ssl2")) { + if (!system("openssl s_client -help 2>&1 | grep -m 1 -q -- -no_ssl2")) { server = "openssl s_client -no_ssl3 -no_ssl2 -connect " ENVIRON["XCATSERVER"] " 2> /dev/null" } } else {