From 6a92f1c01c00f79174f97adccd31928141bc183d Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Sun, 9 Mar 2014 17:57:35 +0800 Subject: [PATCH] [ssl_mgmt] Only overwrite openssl.cnf when ready --- ssl_mgmt/ssl_mgmt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ssl_mgmt/ssl_mgmt b/ssl_mgmt/ssl_mgmt index 3d44f24..1303e6d 100755 --- a/ssl_mgmt/ssl_mgmt +++ b/ssl_mgmt/ssl_mgmt @@ -188,18 +188,17 @@ generate_config () replaceCmd="$(add_to_replace_cmd "$replaceCmd" "@COUNTRY@" "${country:-}")" replaceCmd="$(add_to_replace_cmd "$replaceCmd" "@COMMONNAME@" "${commonName:-}")" replaceCmd="$(add_to_replace_cmd "$replaceCmd" "@ALTNAME@" "${altName:-}")" - sed "$replaceCmd" $confFile.in > $confFile + cnfTmpFile="$(mktemp --tmpdir=. openssl.cnf.XXXXXXXXXX)" + sed "$replaceCmd" $confFile.in > $cnfTmpFile if ask_user_default_no "Do you want to edit the openssl configuration file?" then if [ -n "${EDITOR:-}" ] then - $EDITOR $confFile + $EDITOR $cnfTmpFile else - editor $confFile + editor $cnfTmpFile fi fi - cnfTmpFile="$(mktemp --tmpdir=. openssl.cnf.XXXXXXXXXX)" - mv $confFile $cnfTmpFile grep -v "@[A-Z]\+@" $cnfTmpFile > $confFile rm $cnfTmpFile }